summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.agocs@qt.io>2019-05-28 17:59:34 +0200
committerLaszlo Agocs <laszlo.agocs@qt.io>2019-05-28 17:59:40 +0200
commit0f5c34f2c6b64bae3429706a6c4211334c689092 (patch)
treeb85888d73518f6abc7bbde74ab71a27887682f9d /.gitignore
parent44ca7e31ee9365a72cd17ecd335ec4d0161420a9 (diff)
parent9d61684d70c8691d81536b7b519388586e2cbbb8 (diff)
Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 57606bfacf..9905dd1fdc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,7 @@ wrapper.bat
*.*#
core
.qmake.cache
+.qmake.stash
.qmake.vars
*.prl
tags