]> arthur.barton.de Git - netatalk.git/commit
Fixed conflicts from merge
authorFrank Lahm <franklahm@googlemail.com>
Wed, 20 Oct 2010 12:19:27 +0000 (14:19 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Wed, 20 Oct 2010 12:19:27 +0000 (14:19 +0200)
commit569699bfb3117a1a130e867858b1d509afc2dd12
tree400ca665b2c65de8fe23cbd89ee3ae2ba4d500d3
parent3d4ae3d2b3de58c93af24419e9b84650dd0257c7
parentd28debb1d5df940fd79a16ec69a6240052172735
Fixed conflicts from merge
NEWS
VERSION
etc/afpd/acls.c
etc/afpd/afp_options.c
etc/afpd/filedir.c
etc/afpd/unix.c
etc/cnid_dbd/usockfd.c
include/atalk/acl.h
libatalk/acl/Makefile.am
libatalk/vfs/acl.c
libatalk/vfs/unix.c