]> arthur.barton.de Git - netatalk.git/commitdiff
projects / netatalk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 02085e5 840295b)
Merge branch 'master' of ssh://netatalk.git.sourceforge.net/gitroot/netatalk/netatalk
authorFrank Lahm <franklahm@googlemail.com>
Sun, 6 Mar 2011 15:02:23 +0000 (16:02 +0100)
committerFrank Lahm <franklahm@googlemail.com>
Sun, 6 Mar 2011 15:02:23 +0000 (16:02 +0100)
1  2 
etc/afpd/volume.c patch | diff1 | diff2 | blob | history

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