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

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

author	Andrew Bartlett <abartlet@samba.org>
	Tue, 27 May 2008 22:11:05 +0000 (08:11 +1000)
committer	Andrew Bartlett <abartlet@samba.org>
	Tue, 27 May 2008 22:11:05 +0000 (08:11 +1000)
commit	56f2288e4f4f1aa70d11fc5f118458baf5803627
tree	e59230c05fbb28be85d3b9124607b5868d2e3f13	tree
parent	0c15385e6068d2f70ff11aa5837adbd6d78410ae	commit \| diff
parent	8c0b55114fe35d498626d9d60cc4716b821d4d4f	commit \| diff

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

It seems the format of main.mk changed in my sleep...

Conflicts:

source/main.mk

source/librpc/config.mk	diff1 \|	diff2 \|	blob \| history
source/main.mk	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

source/librpc/config.mk	diff1 \|	diff2 \|	blob \| history
source/main.mk	diff1 \|	diff2 \|	blob \| history