arthur.barton.de Git - netatalk.git/commit

]> arthur.barton.de Git - netatalk.git/commit

projects / netatalk.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8da0f36 53e7f8a)

author	Ralph Boehme <sloowfranklin@gmail.com>
	Mon, 14 Oct 2013 08:49:05 +0000 (10:49 +0200)
committer	Ralph Boehme <sloowfranklin@gmail.com>
	Mon, 14 Oct 2013 08:49:05 +0000 (10:49 +0200)
commit	130d356c840ea83c31c4724c8ae92660360eb07b
tree	ac54e9fa8f682e6108d461343c9dddba97afd76e	tree \| snapshot
parent	8da0f366ed162f10b4a34b98e57e5273c7bc9b4d	commit \| diff
parent	53e7f8a164ca820d5dfe41b7d39ffba8fb056a72	commit \| diff

Merge remote-tracking branch 'origin/branch-netatalk-3-0' into develop

NEWS	diff1 \|	diff2 \|	blob \| history
doc/manpages/man5/afp.conf.5.xml	diff1 \|	diff2 \|	blob \| history
etc/afpd/afp_dsi.c	diff1 \|	diff2 \|	blob \| history
etc/afpd/auth.c	diff1 \|	diff2 \|	blob \| history
etc/uams/uams_dhx2_pam.c	diff1 \|	diff2 \|	blob \| history
include/atalk/globals.h	diff1 \|	diff2 \|	blob \| history
libatalk/util/netatalk_conf.c	diff1 \|	diff2 \|	blob \| history
man/man5/afp.conf.5.in	diff1 \|	diff2 \|	blob \| history

Alex' Netatalk development repository