Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
authorJelmer Vernooij <jelmer@samba.org>
Tue, 4 Mar 2008 13:16:57 +0000 (14:16 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 4 Mar 2008 13:16:57 +0000 (14:16 +0100)
commit5a5b50f3dd7d75214184f711c35a7536b64cbbe7
tree489fa463e4e8a49aa485f4904fd8e7254206070d
parentf4f6f849402488e150e9c759e57bfced6e9dfaf0
parent3ced8006a6a58b459fd68e9b02d7673b16b2df95
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3

Conflicts:

source/build/smb_build/makefile.pm
(This used to be commit 391fea450b2e6664fcd4e4419858997c6094cf3e)
source4/Makefile