From: franklahm <fra...@us...> - 2010-08-16 13:04:30
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Netatalk git repository.". The branch, master has been updated via 7d6f12a42d3a94a91f16788e753fea51d03fe2ba (commit) via e7375f1179198798b6dde811425649615dae10d5 (commit) via 84707714b9282884deef59c3fc03e6a778175de4 (commit) via 9ac7330587a3b96555fcc92386df2d5524614eca (commit) from c71a6ba29dcd592eb640b79ae96c2adad0650254 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7d6f12a42d3a94a91f16788e753fea51d03fe2ba Merge: c71a6ba29dcd592eb640b79ae96c2adad0650254 e7375f1179198798b6dde811425649615dae10d5 Author: Frank Lahm <fra...@go...> Date: Mon Aug 16 15:04:03 2010 +0200 Fix merge conflicts ----------------------------------------------------------------------- Summary of changes: NEWS | 5 +++++ VERSION | 2 +- libatalk/adouble/ad_open.c | 7 ++++--- libatalk/dsi/dsi_tcp.c | 19 ++++++++++++++++--- 4 files changed, 26 insertions(+), 7 deletions(-) hooks/post-receive -- Netatalk git repository. |