summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorKari Oikarinen <kari.oikarinen@qt.io>2019-01-08 08:18:31 +0200
committerKari Oikarinen <kari.oikarinen@qt.io>2019-01-08 08:18:31 +0200
commitf1dd13632651a9efd0ea976a3efdd9c555a34bc2 (patch)
treec647c2741ed1be32c8ad8dac6c962fc79bf17fe4 /.gitignore
parent4ab5838d9ba26eef2b2156bbf9cd428547bbebe0 (diff)
parent1688c44d223145abfdca19a7b31faecbafb0d315 (diff)
downloadqtlocation-f1dd13632651a9efd0ea976a3efdd9c555a34bc2.tar.gz
Merge 5.12 into 5.12.1
Change-Id: Ib65445a9e316252e7483d2878b8cdad252242177
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 5b60c37d..a4fa8e34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -85,6 +85,9 @@ tst_*.log
tst_*.debug
tst_*~
+# Android temporary files
+*so-deployment-settings.json
+
# xemacs temporary files
*.flc