git.samba.org / gd / samba-autobuild / .git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 03ab8f9 71943b2)
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
authorJelmer Vernooij <jelmer@samba.org>
Mon, 25 Feb 2008 11:58:09 +0000 (12:58 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 25 Feb 2008 11:58:09 +0000 (12:58 +0100)
commit584c4a518f4d18452b6515db132e4f75fba733a1
treebbe367f36f092f233d7aefb61d75d5d1e1e85031tree
parent03ab8f9d79f2a06b357b2f5d392ea8b5be263c5ecommit | diff
parent71943b209b181e1e4a65ab477b83780add7051aecommit | diff
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3

Conflicts:

source/build/smb_build/header.pm
source/build/smb_build/makefile.pm
source/lib/ldb/include/ldb_private.h
(This used to be commit 1a646af0647f021d99473a8991c35e616a423ea6)
source4/build/smb_build/input.pm diff1 | diff2 | blob | history
source4/build/smb_build/makefile.pm diff1 | diff2 | blob | history
source4/lib/ldb/common/ldb_modules.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.