git.samba.org / ira / wip.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc1a369 de4a221)
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
authorJelmer Vernooij <jelmer@samba.org>
Fri, 29 Feb 2008 11:45:46 +0000 (12:45 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 29 Feb 2008 11:45:46 +0000 (12:45 +0100)
Conflicts:

source/scripting/python/config.mk
(This used to be commit 0ac0ea660ab63eca764149f1d2828d0238a57289)

1  2 
source4/script/mkproto.pl patch | diff1 | diff2 | blob | history
source4/scripting/ejs/smbcalls.c patch | diff1 | diff2 | blob | history

diff --cc source4/script/mkproto.pl
Simple merge
diff --cc source4/scripting/ejs/smbcalls.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.