arthur.barton.de Git - netatalk.git/commit - libatalk/adouble/ad_conv.c

]> arthur.barton.de Git - netatalk.git/commit - libatalk/adouble/ad_conv.c

projects / netatalk.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7f3a3c2 9f95789)

author	Ralph Boehme <sloowfranklin@gmail.com>
	Tue, 8 Jan 2013 09:54:11 +0000 (10:54 +0100)
committer	Ralph Boehme <sloowfranklin@gmail.com>
	Tue, 8 Jan 2013 09:54:11 +0000 (10:54 +0100)
commit	30963c2b3ee34139e0c3307677d181178a15f37f
tree	9f2ba814e163cac4f258c3bef274d6fda5b57453	tree \| snapshot
parent	7f3a3c2e013db0c6a5a909ca8099239395c9e717	commit \| diff
parent	9f957894d9a60f32adc56edddf72fa767ded8219	commit \| diff

Merge remote-tracking branch 'origin/develop' into spotlight

Conflicts:
etc/netatalk/netatalk.c

12 files changed:

bin/ad/ad_cp.c	diff1 \|	diff2 \|	blob \| history
bin/ad/ad_mv.c	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
etc/afpd/afp_dsi.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
etc/uams/uams_dhx2_pam.c	diff1 \|	diff2 \|	blob \| history
include/atalk/util.h	diff1 \|	diff2 \|	blob \| history
libatalk/unicode/util_unistr.c	diff1 \|	diff2 \|	blob \| history
libatalk/util/netatalk_conf.c	diff1 \|	diff2 \|	blob \| history
macros/netatalk.m4	diff1 \|	diff2 \|	blob \| history

Alex' Netatalk development repository