[SCM] ffmpegthumbs packaging branch, master, updated. debian/4.14.1-1-19-gc46b33a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ffmpegthumbs.git;a=commitdiff;h=8e77d07

The following commit has been merged in the master branch:
commit 8e77d07f5a98e13683c25146e5a466c8349ec694
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Feb 16 14:58:12 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

-- 
ffmpegthumbs packaging