git.samba.org - bbaumbach/samba-autobuild/.git/commit

git.samba.org / bbaumbach / samba-autobuild / .git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 46f22ad be1927c)

author	Jelmer Vernooij <jelmer@samba.org>
	Fri, 30 May 2008 10:18:07 +0000 (12:18 +0200)
committer	Jelmer Vernooij <jelmer@samba.org>
	Fri, 30 May 2008 10:18:07 +0000 (12:18 +0200)
commit	5107f093c270f7a0dfc359de088b475fffc4e279
tree	99f616c6e352f87fbd41e60ad7fae3adf67e72fa	tree
parent	46f22add9ae03b95f4b22235c297737475427f41	commit \| diff
parent	be1927cd80838a6807827cef4431c03160d52582	commit \| diff

Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-defs

Conflicts:

source/samba4-skip
(This used to be commit 7b0e0eb346c2f6a240b20fbcf14029539c6512b9)

source4/samba4-skip	diff1 \|	diff2 \|	blob \| history
source4/selftest/samba4_tests.sh	diff1 \|	diff2 \|	blob \| history
source4/torture/config.mk	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.