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)
commitb4017955e19723e48b41b70c7ba313dcfcda5eb9
tree138d37f4c9abc2dcecd38a6ba4e5c539b4927421
parent1131d4c2545355ef793e468810655c0f72828368
parentb136033421eb045b28f5928e4d2f9604cf704690
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
(This used to be commit bc11e3ef1c34923f5b13571926617a840ad554fe)
source4/build/smb_build/config_mk.pm
source4/build/smb_build/input.pm
source4/build/smb_build/main.pl
source4/build/smb_build/makefile.pm
source4/rules.mk