]> arthur.barton.de Git - netatalk.git/commitdiff
projects / netatalk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f1193cb ffb7186)
Merge remote-tracking branch 'origin/develop' into spotlight
authorRalph Boehme <sloowfranklin@gmail.com>
Sun, 24 Feb 2013 17:37:30 +0000 (18:37 +0100)
committerRalph Boehme <sloowfranklin@gmail.com>
Sun, 24 Feb 2013 17:37:30 +0000 (18:37 +0100)
1  2 
macros/netatalk.m4 patch | diff1 | diff2 | blob | history
macros/summary.m4 patch | diff1 | diff2 | blob | history

diff --cc macros/netatalk.m4
Simple merge
diff --cc macros/summary.m4
Simple merge
Alex' Netatalk development repository