git.samba.org / metze / samba / wip.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5d02514 826dadf)
Merge branch 'nosmbpython' into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Mon, 12 May 2008 01:54:53 +0000 (03:54 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 12 May 2008 01:54:53 +0000 (03:54 +0200)
(This used to be commit 9683f7434c7ea01631d8adae9d43274c77ff51de)

1  2 
source4/selftest/samba4_tests.sh patch | diff1 | diff2 | blob | history
source4/setup/upgrade patch | diff1 | diff2 | blob | history

diff --cc source4/selftest/samba4_tests.sh
Simple merge
diff --cc source4/setup/upgrade
Simple merge
Work in progress branches