summaryrefslogtreecommitdiff
path: root/source4/ntvfs/posix
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-15 15:27:21 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-15 15:27:21 +0100
commit26bc88eabac66423218809513c386635521dce5b (patch)
tree194eaad3479021f5c70ffa158898983429442fa7 /source4/ntvfs/posix
parent6c4acbbf9ee0f92ed614d872686426897dbe26bc (diff)
parent9d9d54430aed677ae33e51fda5da7b4306c734f1 (diff)
downloadsamba-26bc88eabac66423218809513c386635521dce5b.tar.gz
samba-26bc88eabac66423218809513c386635521dce5b.tar.bz2
samba-26bc88eabac66423218809513c386635521dce5b.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
Conflicts: source/torture/libnet/libnet_BecomeDC.c (This used to be commit 2da0734f439ee5f4e3eb1c9416e7df4450f08534)
Diffstat (limited to 'source4/ntvfs/posix')
0 files changed, 0 insertions, 0 deletions