Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
authorJelmer Vernooij <jelmer@samba.org>
Thu, 27 Mar 2008 23:59:54 +0000 (00:59 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 27 Mar 2008 23:59:54 +0000 (00:59 +0100)
commit90f76ae99b537c24e8e26fead1d8b857afa0a7a6
tree8f93070e2e20d7dc5345740bf59dacdd65e784c5
parent18d80bdf1fc5a281358aef29324230698eb434d4
parent4eb694389c88dd33f5ebea78c11ca1cb108357d2
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
(This used to be commit 4e0b94d648e955b950c50d2ac19e17b06ee1f818)
source4/Makefile