arthur.barton.de Git - netatalk.git/commit - etc/afpd/afp_dsi.c

]> arthur.barton.de Git - netatalk.git/commit - etc/afpd/afp_dsi.c

projects / netatalk.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 96afca8 636cc94)

author	Ralph Boehme <sloowfranklin@gmail.com>
	Thu, 14 Feb 2013 15:24:11 +0000 (16:24 +0100)
committer	Ralph Boehme <sloowfranklin@gmail.com>
	Thu, 14 Feb 2013 15:24:11 +0000 (16:24 +0100)
commit	791d1f2cf4511210ff72486b0338db1d9cc7b7ab
tree	0b73c378878396abbf416792d47ccb8e523c3ef8	tree \| snapshot
parent	96afca89fe09964bedaefcd6fd65cdc03b073243	commit \| diff
parent	636cc94f161c16f1e7ef5fa2e5df374e5f296e2c	commit \| diff

Merge branch 'develop' into spotlight

Conflicts:
VERSION
configure.ac

15 files changed:

VERSION	diff1 \|	diff2 \|	blob \| history
configure.ac	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/dsi.h	diff1 \|	diff2 \|	blob \| history
include/atalk/globals.h	diff1 \|	diff2 \|	blob \| history
include/atalk/util.h	diff1 \|	diff2 \|	blob \| history
libatalk/Makefile.am	diff1 \|	diff2 \|	blob \| history
libatalk/unicode/charcnv.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

Alex' Netatalk development repository