aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2013-10-16 12:39:27 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-16 12:39:27 +0200
commit4c925babf9e7f516479a0e418e9b3f509d3cd4b7 (patch)
treee7bc8bd3706d6e7b726025708bc77150fda773ec /.gitignore
parentd00002337613fa6681aed81193565ed7a5a4e472 (diff)
parent38b7c75f6b2057a1eaf1fd79f175c256513d8b1f (diff)
Merge "Merge branch 'stable' into dev" into refs/staging/dev
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 7bd3d3d6..d5a0a45c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
Makefile
.qmake.cache
+.qmake.super