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: b0f247a 006ac15)

author	Ralph Boehme <sloowfranklin@gmail.com>
	Fri, 2 Aug 2013 15:34:24 +0000 (17:34 +0200)
committer	Ralph Boehme <sloowfranklin@gmail.com>
	Fri, 2 Aug 2013 15:34:24 +0000 (17:34 +0200)
commit	3a16f6dfaf832c1e50086579bc7c4f774ed686a9
tree	143293bc1584bae0caca151991a45bff889c6d1b	tree \| snapshot
parent	b0f247a03be9472df844534358b4b7902ea9695a	commit \| diff
parent	006ac157bdfcbd8cba5f82eb232ba946324f278f	commit \| diff

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

Conflicts:
include/atalk/globals.h
libatalk/util/netatalk_conf.c

NEWS	diff1 \|	diff2 \|	blob \| history
doc/manpages/man5/afp.conf.5.xml	diff1 \|	diff2 \|	blob \| history
etc/afpd/file.c	diff1 \|	diff2 \|	blob \| history
include/atalk/globals.h	diff1 \|	diff2 \|	blob \| history
include/atalk/util.h	diff1 \|	diff2 \|	blob \| history
include/atalk/volume.h	diff1 \|	diff2 \|	blob \| history
libatalk/Makefile.am	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