diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-04-11 11:11:42 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-04-11 11:11:42 +1000 |
| commit | ae977ef24780c52da66e3608a3ed94649ae9f873 (patch) | |
| tree | 51f1a491b9f515049bc6eb3dc2b3b8ae2a3743e6 /source4/torture/basic/delaywrite.c | |
| parent | 9198a519bea19a4d9f863fde5fb3aa23f60b5c88 (diff) | |
| parent | 8ed6f6d5a825c8b0e8d66d30877a91a96fe6e7a4 (diff) | |
| download | samba-ae977ef24780c52da66e3608a3ed94649ae9f873.tar.gz samba-ae977ef24780c52da66e3608a3ed94649ae9f873.tar.bz2 samba-ae977ef24780c52da66e3608a3ed94649ae9f873.zip | |
Fix merge errors on C provision interface after jelmer's good work.
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
Conflicts:
source/torture/local/torture.c
(This used to be commit 5bf1c89cf8af08fbcf4f5089079920840daad7b8)
Diffstat (limited to 'source4/torture/basic/delaywrite.c')
0 files changed, 0 insertions, 0 deletions