git.samba.org / kai / samba-autobuild / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6c4acbb 9d9d544)
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
authorJelmer Vernooij <jelmer@samba.org>
Fri, 15 Feb 2008 14:27:21 +0000 (15:27 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 15 Feb 2008 14:27:21 +0000 (15:27 +0100)
Conflicts:

source/torture/libnet/libnet_BecomeDC.c
(This used to be commit 2da0734f439ee5f4e3eb1c9416e7df4450f08534)

1  2 
source4/torture/config.mk patch | diff1 | diff2 | blob | history

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