[SCM] Akonadi packaging branch, master, updated. debian/1.3.1-3-3-g1639f55

Modestas Vainius modax at alioth.debian.org
Mon Jul 26 20:49:36 UTC 2010


The following commit has been merged in the master branch:
commit 1639f55cedda9e2558e63eecd0024ca09abdd046
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Mon Jul 26 23:46:29 2010 +0300

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

-- 
Akonadi packaging



More information about the pkg-kde-commits mailing list