diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-03-27 20:38:36 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-03-27 20:38:36 +1100 |
| commit | c24b8cbe5351d2b192480ff8cbd02b3f048b8e8a (patch) | |
| tree | ddd0b5764d2dba4e6a6ccedd3101a5486dbf01c1 /source4/lib/charset/iconv.c | |
| parent | 4fc27c9969960dfef73ad80438d274e0f45e119e (diff) | |
| parent | 2c9ee20f15ef0f55bf4e2516ba498cc6d9403b71 (diff) | |
| download | samba-c24b8cbe5351d2b192480ff8cbd02b3f048b8e8a.tar.gz samba-c24b8cbe5351d2b192480ff8cbd02b3f048b8e8a.tar.bz2 samba-c24b8cbe5351d2b192480ff8cbd02b3f048b8e8a.zip | |
Merge with metze's change for oplocks to be on by default
Andrew Bartlett
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
Conflicts:
source/ntvfs/common/opendb_tdb.c
(This used to be commit 7c7a1a2b1f69cb4623c8832b732e8a1343ebd109)
Diffstat (limited to 'source4/lib/charset/iconv.c')
0 files changed, 0 insertions, 0 deletions