]> arthur.barton.de Git - netatalk.git/commit - etc/afpd/file.c
projects / netatalk.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ae882d2 cc60538)
Merge remote-tracking branch 'origin/develop' into spotlight
authorRalph Boehme <sloowfranklin@gmail.com>
Thu, 21 Feb 2013 17:43:15 +0000 (18:43 +0100)
committerRalph Boehme <sloowfranklin@gmail.com>
Thu, 21 Feb 2013 17:43:15 +0000 (18:43 +0100)
commit87c02d4df072d4b069b2e75462b2ee95eeb1fe7a
tree8109e24fbbe87e15d8ec375798604cdb1021d118tree | snapshot
parentae882d2dd45116ab9e0af8a50cbb9a6d2409fd47commit | diff
parentcc6053806460d7bccfc45ac85529bf696136aba6commit | diff
Merge remote-tracking branch 'origin/develop' into spotlight

Conflicts:
config/Makefile.am
etc/afpd/afp_dsi.c
etc/afpd/auth.c
include/atalk/Makefile.am
16 files changed:
config/Makefile.am diff1 | diff2 | blob | history
configure.ac diff1 | diff2 | blob | history
etc/afpd/Makefile.am diff1 | diff2 | blob | history
etc/afpd/afp_dsi.c diff1 | diff2 | blob | history
etc/afpd/auth.c diff1 | diff2 | blob | history
etc/afpd/file.c diff1 | diff2 | blob | history
etc/afpd/main.c diff1 | diff2 | blob | history
etc/netatalk/netatalk.c diff1 | diff2 | blob | history
include/atalk/Makefile.am diff1 | diff2 | blob | history
include/atalk/dsi.h diff1 | diff2 | blob | history
include/atalk/globals.h diff1 | diff2 | blob | history
libatalk/util/logger.c diff1 | diff2 | blob | history
libatalk/util/netatalk_conf.c diff1 | diff2 | blob | history
macros/netatalk.m4 diff1 | diff2 | blob | history
macros/summary.m4 diff1 | diff2 | blob | history
test/afpd/Makefile.am diff1 | diff2 | blob | history
Alex' Netatalk development repository