]> arthur.barton.de Git - netatalk.git/commitdiff
projects / netatalk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 42eb54d cc423db)
Merge remote-tracking branch 'origin/develop' into spotlight
authorRalph Boehme <sloowfranklin@gmail.com>
Tue, 5 Mar 2013 10:52:11 +0000 (11:52 +0100)
committerRalph Boehme <sloowfranklin@gmail.com>
Tue, 5 Mar 2013 10:52:11 +0000 (11:52 +0100)
1  2 
etc/afpd/main.c patch | diff1 | diff2 | blob | history

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