git.samba.org / ab / samba.git / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dc114f8 78f804c)
Merge branch 'v4-0-test' of /home/jelmer/samba34.git/samba4 into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Sun, 18 May 2008 19:10:41 +0000 (21:10 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 18 May 2008 19:10:41 +0000 (21:10 +0200)
Conflicts:

source/build/smb_build/makefile.pm
(This used to be commit 57b57b1ff9a2ddf087fc6cceaf6c9afb4f8f0135)

1  2 
source4/build/make/templates.mk patch | diff1 | diff2 | blob | history

diff --cc source4/build/make/templates.mk
Simple merge
Unnamed repository; edit this file 'description' to name the repository.