summaryrefslogtreecommitdiff
path: root/testdata
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2006-10-06 15:16:18 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:20:38 -0500
commit59b6b665d6f043bc372ab868e0ecd8ad4da5f2ef (patch)
tree1a0516da5e5d477d1f0a9e19cd85f89d5c985ba5 /testdata
parent109bf77ea3e96d255e74aa7c5dfbaf131a625452 (diff)
downloadsamba-59b6b665d6f043bc372ab868e0ecd8ad4da5f2ef.tar.gz
samba-59b6b665d6f043bc372ab868e0ecd8ad4da5f2ef.tar.bz2
samba-59b6b665d6f043bc372ab868e0ecd8ad4da5f2ef.zip
r19136: No conflict, after "svn up" it applied correctly", merge 19126 from 3_0
(This used to be commit 042a22b6dd34bb147cf4f8cc10f98d4cda3ccd55)
Diffstat (limited to 'testdata')
0 files changed, 0 insertions, 0 deletions