git.samba.org / metze / samba / wip.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e12c0b6 1b06210)
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-fixmodulesdir
authorJelmer Vernooij <jelmer@samba.org>
Tue, 17 Jun 2008 11:48:29 +0000 (13:48 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 17 Jun 2008 11:48:29 +0000 (13:48 +0200)
1  2 
source/selftest/target/Samba4.pm patch | diff1 | diff2 | blob | history

diff --cc source/selftest/target/Samba4.pm
Simple merge
Work in progress branches