[SCM] qtbase packaging branch, ubuntu, updated. debian/5.4.2+dfsg-2-17-g4657478

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit c94272c2e26678d47463a1b4d2bd229da80e2d31
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Jun 8 07:07:00 2015 +0000

    git: preserve symbols files during merges
---
 .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

-- 
qtbase packaging