[SCM] qtdeclarative packaging branch, ubuntu, updated. ubuntu/5.4.2-1ubuntu2-12-g506d12c

[Timo Jyrinki]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtdeclarative.git;a=commitdiff;h=506d12c

The following commit has been merged in the ubuntu branch:
commit 506d12cee64f385b83e45abf243ff771f81d99cd
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Jul 13 11:11:33 2015 +0000

    Add .gitattributes to prefer our symbol files when merging.
---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..af7d4d4
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+debian/*.symbols merge=ours

-- 
qtdeclarative packaging