]> arthur.barton.de Git - netatalk.git/commitdiff
Merge remote-tracking branch 'origin/develop' into spotlight
authorRalph Boehme <sloowfranklin@gmail.com>
Tue, 12 Mar 2013 23:12:58 +0000 (00:12 +0100)
committerRalph Boehme <sloowfranklin@gmail.com>
Tue, 12 Mar 2013 23:12:58 +0000 (00:12 +0100)
1  2 
etc/afpd/Makefile.am
etc/afpd/file.c
libatalk/util/netatalk_conf.c
macros/netatalk.m4

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