]> arthur.barton.de Git - netatalk.git/commit - etc/afpd/afp_dsi.c
Merge remote-tracking branch 'origin/spotlight' into develop
authorRalph Boehme <sloowfranklin@gmail.com>
Tue, 9 Apr 2013 12:57:03 +0000 (14:57 +0200)
committerRalph Boehme <sloowfranklin@gmail.com>
Tue, 9 Apr 2013 12:57:03 +0000 (14:57 +0200)
commitef392707747a6a31bc70837303db8f7d0d63ffc1
tree702cc149148b3b92e7a6d639236a8cb940881d75
parent4c691d7ebf0d54b3ee69d54955bcaf2283e98abc
parent934a989edfd5a4ab40b14029c3cec22bc52ccba8
Merge remote-tracking branch 'origin/spotlight' into develop
include/atalk/globals.h
libatalk/util/netatalk_conf.c