[SCM] kapidox packaging branch, master, updated. debian/5.19.0-1-28-g90d0020

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kapidox.git;a=commitdiff;h=02493f6

The following commit has been merged in the master branch:
commit 02493f61eaaede162063150d761876a30006f668
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Apr 18 19:24:55 2016 +0200

    Add a .gitattributes file to use 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

-- 
kapidox packaging