summaryrefslogtreecommitdiff
path: root/swat2.txt
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-29 15:21:33 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-29 15:21:33 +0100
commit9be199944d29d8f3c8e25ad96c02c824d2853b54 (patch)
treeb8900763a2a93e1da1cb93b6f0b1fb7fedf5b186 /swat2.txt
parentc8011b5d09390318ea6aa5639a142797128e5dab (diff)
parent07f6f9b2115b3df03ac11a0db9bf1c4ff5d513cc (diff)
downloadsamba-9be199944d29d8f3c8e25ad96c02c824d2853b54.tar.gz
samba-9be199944d29d8f3c8e25ad96c02c824d2853b54.tar.bz2
samba-9be199944d29d8f3c8e25ad96c02c824d2853b54.zip
Merge branch 'v4-0-test' into v4-0-gmake3
Conflicts: source/Makefile source/build/smb_build/main.pl source/build/smb_build/makefile.pm source/dynconfig.mk source/scripting/python/config.mk (This used to be commit 744d9fd8731321abea37b0cb14ca75e1b4654722)
Diffstat (limited to 'swat2.txt')
0 files changed, 0 insertions, 0 deletions