]> arthur.barton.de Git - netatalk.git/commitdiff
projects / netatalk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8ea9eaa b531dae)
Merge remote-tracking branch 'remotes/origin/branch-netatalk-2-1'
authorHAT <hat@fa2.so-net.ne.jp>
Tue, 8 Mar 2011 17:18:43 +0000 (02:18 +0900)
committerHAT <hat@fa2.so-net.ne.jp>
Tue, 8 Mar 2011 17:18:43 +0000 (02:18 +0900)
1  2 
etc/afpd/status.c patch | diff1 | diff2 | blob | history

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