git.samba.org / gd / samba-autobuild / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 46f22ad be1927c)
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-defs
authorJelmer Vernooij <jelmer@samba.org>
Fri, 30 May 2008 10:18:07 +0000 (12:18 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 30 May 2008 10:18:07 +0000 (12:18 +0200)
Conflicts:

source/samba4-skip
(This used to be commit 7b0e0eb346c2f6a240b20fbcf14029539c6512b9)

1  2 
source4/samba4-skip patch | diff1 | diff2 | blob | history
source4/selftest/samba4_tests.sh patch | diff1 | diff2 | blob | history
source4/torture/config.mk patch | diff1 | diff2 | blob | history

diff --cc source4/samba4-skip
Simple merge
diff --cc source4/selftest/samba4_tests.sh
Simple merge
diff --cc source4/torture/config.mk
Simple merge
Unnamed repository; edit this file 'description' to name the repository.