]> arthur.barton.de Git - netatalk.git/commitdiff
Merge remote-tracking branch 'origin/develop' into spotlight
authorFrank Lahm <franklahm@googlemail.com>
Fri, 2 Nov 2012 03:01:45 +0000 (04:01 +0100)
committerFrank Lahm <franklahm@googlemail.com>
Fri, 2 Nov 2012 03:01:45 +0000 (04:01 +0100)
1  2 
etc/afpd/file.c
include/atalk/util.h
libatalk/util/netatalk_conf.c

diff --cc etc/afpd/file.c
Simple merge
Simple merge
Simple merge