git.samba.org / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a58df2f 228f342)
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Wed, 16 Apr 2008 14:12:58 +0000 (16:12 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 16 Apr 2008 14:12:58 +0000 (16:12 +0200)
(This used to be commit 18dd8120cc35fe3d1cd4455c1f6a32b503274d97)

1  2 
testprogs/blackbox/test_wbinfo.sh patch | diff1 | diff2 | blob | history

diff --cc testprogs/blackbox/test_wbinfo.sh
Simple merge
Samba Shared Repository