[SCM] kjumpingcube packaging branch, master, updated. debian/4.12.2-2-21-g6533dbe

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kjumpingcube.git;a=commitdiff;h=94e7aec

The following commit has been merged in the master branch:
commit 94e7aec993a25b9647f5d687d963aeb3f21ae72a
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Feb 22 12:52:28 2015 +0100

    Add gitattributes to merge changelog with dpkg-mergechangelog
---
 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

-- 
kjumpingcube packaging