summaryrefslogtreecommitdiff
path: root/source4/script
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-18 11:59:02 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-18 11:59:02 +0100
commit4e750552b789054f094c3dc42f091cebdc4f715e (patch)
tree6231d9969f39482b5b9e74e7ee519a96cc989653 /source4/script
parent85ac8dc17ad8cd01bb773383fd30261b9f357292 (diff)
parente8cf95773df914e8d71dcc1ce713fe0cc723d946 (diff)
downloadsamba-4e750552b789054f094c3dc42f091cebdc4f715e.tar.gz
samba-4e750552b789054f094c3dc42f091cebdc4f715e.tar.bz2
samba-4e750552b789054f094c3dc42f091cebdc4f715e.zip
Merge branch 'v4-0-trivial' into v4-0-gmake3
Conflicts: source/build/smb_build/main.pl source/build/smb_build/makefile.pm (This used to be commit d31987461984aebf8c6f2513e83c92757c0f83c7)
Diffstat (limited to 'source4/script')
0 files changed, 0 insertions, 0 deletions