]> arthur.barton.de Git - netatalk.git/commitdiff
projects / netatalk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b21ca07 ff3b464)
Merge master
authorFrank Lahm <franklahm@googlemail.com>
Wed, 12 Jan 2011 15:44:54 +0000 (16:44 +0100)
committerFrank Lahm <franklahm@googlemail.com>
Wed, 12 Jan 2011 15:44:54 +0000 (16:44 +0100)
1  2 
etc/afpd/status.c patch | diff1 | diff2 | blob | history

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