]> arthur.barton.de Git - netatalk.git/commit - man/man8/Makefile.am
Fix merge conflicts
authorFrank Lahm <franklahm@googlemail.com>
Mon, 16 Aug 2010 13:04:03 +0000 (15:04 +0200)
committerFrank Lahm <franklahm@googlemail.com>
Mon, 16 Aug 2010 13:04:03 +0000 (15:04 +0200)
commit7d6f12a42d3a94a91f16788e753fea51d03fe2ba
treeb66813ecaaf6aa3df913d1f696e9434b89241aa4
parentc71a6ba29dcd592eb640b79ae96c2adad0650254
parente7375f1179198798b6dde811425649615dae10d5
Fix merge conflicts
NEWS
VERSION
libatalk/dsi/dsi_tcp.c