summaryrefslogtreecommitdiff
path: root/source3/modules/vfs_aixacl_util.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2009-02-25 12:49:37 +0100
committerJelmer Vernooij <jelmer@samba.org>2009-02-25 12:49:37 +0100
commit258ae4cec596631b758fb17c170c4494e4db8a8e (patch)
tree5c9ef9246eef3af3b744e862d0e5314a4686304e /source3/modules/vfs_aixacl_util.c
parentfff055f8e33a8f0bbb5e7cc5b77d6251bf37e0cf (diff)
parenta041d9061922b1a90e5b5047af77934d908afdd5 (diff)
downloadsamba-258ae4cec596631b758fb17c170c4494e4db8a8e.tar.gz
samba-258ae4cec596631b758fb17c170c4494e4db8a8e.tar.bz2
samba-258ae4cec596631b758fb17c170c4494e4db8a8e.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Conflicts: source4/scripting/python/samba/provision.py
Diffstat (limited to 'source3/modules/vfs_aixacl_util.c')
0 files changed, 0 insertions, 0 deletions