git.samba.org / kai / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 94c937f 5e336be)
Merge branch 'v4-0-trivial' into v4-0-gmake3
authorJelmer Vernooij <jelmer@samba.org>
Mon, 18 Feb 2008 12:33:35 +0000 (13:33 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 18 Feb 2008 12:33:35 +0000 (13:33 +0100)
Conflicts:

source/build/smb_build/makefile.pm
(This used to be commit 4d190270463f8db475c152f5502c9de01765d904)

1  2 
source4/build/smb_build/input.pm patch | diff1 | diff2 | blob | history
source4/build/smb_build/main.pl patch | diff1 | diff2 | blob | history

diff --cc source4/build/smb_build/input.pm
Simple merge
diff --cc source4/build/smb_build/main.pl
Simple merge
Kai's WIP code