]> arthur.barton.de Git - netatalk.git/commitdiff
projects / netatalk.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4054f4b f7aa366)
Merge branch-2-1
authorFrank Lahm <franklahm@googlemail.com>
Mon, 6 Jun 2011 14:08:48 +0000 (16:08 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Mon, 6 Jun 2011 14:08:48 +0000 (16:08 +0200)
1  2 
config/Makefile.am patch | diff1 | diff2 | blob | history

diff --cc config/Makefile.am
Simple merge
Alex' Netatalk development repository