git.samba.org / ab / samba.git / .git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit26bc88eabac66423218809513c386635521dce5b
tree194eaad3479021f5c70ffa158898983429442fa7tree
parent6c4acbbf9ee0f92ed614d872686426897dbe26bccommit | diff
parent9d9d54430aed677ae33e51fda5da7b4306c734f1commit | diff
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial

Conflicts:

source/torture/libnet/libnet_BecomeDC.c
(This used to be commit 2da0734f439ee5f4e3eb1c9416e7df4450f08534)
source4/torture/config.mk diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.