diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-10-15 10:01:01 +0200 |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-10-15 12:13:50 +0200 |
commit | 38b7c75f6b2057a1eaf1fd79f175c256513d8b1f (patch) | |
tree | 608053242c83a3d478f38bfc8524a15788e13b3d /.gitignore | |
parent | 1aa3ccbc4c789fb0ef265f88c9062b8bc591c449 (diff) | |
parent | f9a5d1941655bd5cceaa7ded5893fea3206c5bea (diff) |
Merge branch 'stable' into dev
Change-Id: I25b06e3ed27caab7b80c4e47a7e836559397c3c8
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1,2 +1,3 @@ Makefile .qmake.cache +.qmake.super |