summaryrefslogtreecommitdiff
path: root/source3/torture
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2006-12-12 15:14:27 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:16:25 -0500
commit79416a522681f7384a42bd69c8a02e94616610a1 (patch)
treef5860c3070c28635b4fd9a0e981a34321b74fefa /source3/torture
parent4225f9a4bd5eece4d57820bbabb7b882610aa7cc (diff)
downloadsamba-79416a522681f7384a42bd69c8a02e94616610a1.tar.gz
samba-79416a522681f7384a42bd69c8a02e94616610a1.tar.bz2
samba-79416a522681f7384a42bd69c8a02e94616610a1.zip
r20117: 1st Error in the merge
(This used to be commit 5e46c43a2e4b9a3ee8f1f219c96a6b132bb09322)
Diffstat (limited to 'source3/torture')
0 files changed, 0 insertions, 0 deletions