git.samba.org / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1ce345e db2447a)
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-nodeclare
authorJelmer Vernooij <jelmer@samba.org>
Wed, 20 Feb 2008 09:55:20 +0000 (10:55 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 20 Feb 2008 09:55:20 +0000 (10:55 +0100)
(This used to be commit 7a2ff3ee26bce49a3eeeb270f4a5e4df2adbefbb)

1  2 
source4/build/smb_build/makefile.pm patch | diff1 | diff2 | blob | history

diff --cc source4/build/smb_build/makefile.pm
Simple merge
Samba Shared Repository