diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-08 01:00:50 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-08 01:00:51 +0200 |
| commit | 0a775ded35acf7172e3f852d55de7e28a5370653 (patch) | |
| tree | 8de83b9f8adc12899bb2e6bd40590ecd6727d90c /.gitignore | |
| parent | bb882f433b6cf6fca56049df6b654fb6a39a7cab (diff) | |
| parent | 4a4842118d2303a8d851d1d8b85fe182d3fe492a (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: I3eb5d1affe64b6ae709d1154cc37de91db3816b6
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
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 |