aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2013-10-15 10:01:01 +0200
committerSergio Ahumada <sergio.ahumada@digia.com>2013-10-15 12:13:50 +0200
commit38b7c75f6b2057a1eaf1fd79f175c256513d8b1f (patch)
tree608053242c83a3d478f38bfc8524a15788e13b3d /.gitignore
parent1aa3ccbc4c789fb0ef265f88c9062b8bc591c449 (diff)
parentf9a5d1941655bd5cceaa7ded5893fea3206c5bea (diff)
Merge branch 'stable' into 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