git.samba.org / gd / samba / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3fbcc21 acae07b)
Merge branch 'master' of ssh://git.samba.org/data/git/samba into noejs
authorJelmer Vernooij <jelmer@samba.org>
Fri, 19 Sep 2008 14:26:00 +0000 (16:26 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 19 Sep 2008 14:26:00 +0000 (16:26 +0200)
1  2 
source4/librpc/config.mk patch | diff1 | diff2 | blob | history
source4/selftest/samba4_tests.sh patch | diff1 | diff2 | blob | history

diff --cc source4/librpc/config.mk
Simple merge
diff --cc source4/selftest/samba4_tests.sh
Simple merge
Samba Development trees