]> arthur.barton.de Git - netatalk.git/commitdiff
projects / netatalk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b3bcbf9 5b86491)
Merge from branch-2-1
authorFrank Lahm <franklahm@googlemail.com>
Tue, 14 Sep 2010 14:13:06 +0000 (16:13 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Tue, 14 Sep 2010 14:13:06 +0000 (16:13 +0200)
1  2 
etc/afpd/main.c patch | diff1 | diff2 | blob | history

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