[SCM] oxygen-icons5 packaging branch, master, updated. 65aa7282c9308bff4eb18902a83fc503e5f60030

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/oxygen-icons5.git;a=commitdiff;h=58b80f3

The following commit has been merged in the master branch:
commit 58b80f340a6e2d983e013f93ac62f2d8fabdbdd7
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Mon Jul 26 23:45:09 2010 +0300

    Use dpkg-mergechangelogs merge driver for the changelog.
---
 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

-- 
oxygen-icons5 packaging