summaryrefslogtreecommitdiff
path: root/merged-branches.txt
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-10-24 11:39:28 +0200
committerStefan Metzmacher <metze@samba.org>2011-10-24 17:46:47 +0200
commitf3c25bc6a5f23a248f832fa58c59c16522ac255b (patch)
treed80783fa925cebf763703a870f54d14c01d62290 /merged-branches.txt
parent2414169241c874b3c764d91b598e1c2c0939e037 (diff)
downloadsamba-f3c25bc6a5f23a248f832fa58c59c16522ac255b.tar.gz
samba-f3c25bc6a5f23a248f832fa58c59c16522ac255b.tar.bz2
samba-f3c25bc6a5f23a248f832fa58c59c16522ac255b.zip
libcli/smb: merge LOCKING_ANDX_* and OPLOCK_* defines to smb_constants.h
metze Autobuild-User: Stefan Metzmacher <metze@samba.org> Autobuild-Date: Mon Oct 24 17:46:47 CEST 2011 on sn-devel-104
Diffstat (limited to 'merged-branches.txt')
0 files changed, 0 insertions, 0 deletions