git.samba.org - samba.git/commit - source4/include/includes.h

git.samba.org / samba.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 88ad1a9 fc7050e)

author	Jelmer Vernooij <jelmer@samba.org>
	Thu, 18 Sep 2008 18:29:05 +0000 (20:29 +0200)
committer	Jelmer Vernooij <jelmer@samba.org>
	Thu, 18 Sep 2008 18:29:05 +0000 (20:29 +0200)
commit	729ffbae086309992d7433a296fca64f6800f8fa
tree	6c133d2b91ab9313da11bf8bad15f497e1b5c61f	tree
parent	88ad1a936ccd2451d6dbf542a0a746ad71a3e968	commit \| diff
parent	fc7050e54c69919d754ca0adf3f2f741a501fec4	commit \| diff

Merge branch 'master' of ssh://git.samba.org/data/git/samba into noejs

Conflicts:
source4/main.mk

pidl/pidl	diff1 \|	diff2 \|	blob \| history
source4/Makefile	diff1 \|	diff2 \|	blob \| history
source4/configure.ac	diff1 \|	diff2 \|	blob \| history
source4/main.mk	diff1 \|	diff2 \|	blob \| history
source4/selftest/samba4_tests.sh	diff1 \|	diff2 \|	blob \| history

Samba Shared Repository