]> arthur.barton.de Git - netatalk.git/commitdiff
Mere sf master
authorFrank Lahm <franklahm@googlemail.com>
Fri, 22 Jul 2011 04:35:16 +0000 (06:35 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Fri, 22 Jul 2011 04:35:16 +0000 (06:35 +0200)
1  2 
etc/afpd/auth.c
etc/afpd/status.c
etc/afpd/status.h
man/man1/dbd.1

diff --cc etc/afpd/auth.c
Simple merge
Simple merge
Simple merge
diff --cc man/man1/dbd.1
Simple merge