[SCM] qtbase packaging branch, master, updated. debian/5.0.2+dfsg1-2-9-gadc2f78

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit adc2f784faa362ebbc850a4e3daeb3df84676fad
Author: Pino Toscano <pino at debian.org>
Date:   Sun Apr 21 20:03:09 2013 +0200

    add a .gitattributes
---
 debian/.gitattributes |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

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

-- 
qtbase packaging