git.samba.org / kamenim / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2fc058b 0fd0fc7)
Merge branch 'selftest' of git://git.samba.org/jelmer/samba
authorJelmer Vernooij <jelmer@samba.org>
Sun, 19 Oct 2008 08:20:37 +0000 (10:20 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 19 Oct 2008 08:20:37 +0000 (10:20 +0200)
1  2 
source4/Makefile patch | diff1 | diff2 | blob | history
source4/selftest/config.mk patch | diff1 | diff2 | blob | history

diff --cc source4/Makefile
Simple merge
diff --cc source4/selftest/config.mk
Simple merge
kamenim's wip repo