[mupen64plus-core] 168/310: Merge changelogs with dpkg-mergechangelogs

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-core.

commit 9615f9f6904b8210c9ef40e8f1e6f66f7d740eca
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sat Jun 16 10:52:17 2012 +0200

    Merge changelogs with dpkg-mergechangelogs
---
 debian/.gitattributes | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/.gitattributes b/debian/.gitattributes
new file mode 100644
index 0000000..6a03163
--- /dev/null
+++ b/debian/.gitattributes
@@ -0,0 +1 @@
+changelog merge=dpkg-mergechangelogs

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-core.git