Merge branch 'v4-0-trivial' into v4-0-gmake3
authorJelmer Vernooij <jelmer@samba.org>
Mon, 18 Feb 2008 21:25:19 +0000 (22:25 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 18 Feb 2008 21:25:19 +0000 (22:25 +0100)
commitbc11e3ef1c34923f5b13571926617a840ad554fe
tree5b1273ef7ec799ba46a8882d2c8af2e750130486
parent4d190270463f8db475c152f5502c9de01765d904
parent16b4af184187f29f1f710609ee37029a3f15a294
Merge branch 'v4-0-trivial' into v4-0-gmake3

Conflicts:

source/build/smb_build/input.pm
source/build/smb_build/main.pl
source/build/smb_build/makefile.pm
source/build/smb_build/config_mk.pm
source/build/smb_build/input.pm
source/build/smb_build/main.pl
source/build/smb_build/makefile.pm
source/rules.mk