summaryrefslogtreecommitdiff
path: root/source4/selftest
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-03-04 14:16:57 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-03-04 14:16:57 +0100
commit5a5b50f3dd7d75214184f711c35a7536b64cbbe7 (patch)
tree489fa463e4e8a49aa485f4904fd8e7254206070d /source4/selftest
parentf4f6f849402488e150e9c759e57bfced6e9dfaf0 (diff)
parent3ced8006a6a58b459fd68e9b02d7673b16b2df95 (diff)
downloadsamba-5a5b50f3dd7d75214184f711c35a7536b64cbbe7.tar.gz
samba-5a5b50f3dd7d75214184f711c35a7536b64cbbe7.tar.bz2
samba-5a5b50f3dd7d75214184f711c35a7536b64cbbe7.zip
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)
Diffstat (limited to 'source4/selftest')
0 files changed, 0 insertions, 0 deletions