]> arthur.barton.de Git - netatalk.git/commitdiff
projects / netatalk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 84c3a8f 906f7d1)
Merge remote branch 'sf/branch-allea' into branch-allea
authorFrank Lahm <franklahm@googlemail.com>
Fri, 17 Feb 2012 16:23:43 +0000 (17:23 +0100)
committerFrank Lahm <franklahm@googlemail.com>
Fri, 17 Feb 2012 16:23:43 +0000 (17:23 +0100)
1  2 
etc/afpd/afp_config.c patch | diff1 | diff2 | blob | history

diff --cc etc/afpd/afp_config.c
Simple merge
Alex' Netatalk development repository