[SCM] qt3d packaging branch, master, updated. 34f6db3851a5744e7caef172477a0e9767dea0eb

[Timo Jyrinki]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt3d.git;a=commitdiff;h=83deb0e

The following commit has been merged in the master branch:
commit 83deb0e4865299d52ba6f890dc3af11767d06eac
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Tue Jul 9 09:50:18 2013 +0300

    Add .gitattributes
---
 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

-- 
qt3d packaging