[SCM] qtlocation packaging branch, ubuntu, updated. ubuntu/5.4.2-1ubuntu1-10-ga4c3961

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit a4c3961a158daef87e909e0acde64c640f9048fb
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Wed Sep 9 13:47:44 2015 +0000

    Add .gitattributes to prefer our own symbols files.
---
 .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

-- 
qtlocation packaging