]> arthur.barton.de Git - netatalk.git/commitdiff
projects / netatalk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 85569d9 381bdbb)
Merge master
authorFrank Lahm <franklahm@googlemail.com>
Wed, 22 Dec 2010 11:28:40 +0000 (12:28 +0100)
committerFrank Lahm <franklahm@googlemail.com>
Wed, 22 Dec 2010 11:28:40 +0000 (12:28 +0100)
1  2 
etc/afpd/status.c patch | diff1 | diff2 | blob | history

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