diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-08-07 08:09:45 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-08-07 08:09:45 +0200 |
| commit | 2521023627066ba6dd6f6446f2ad6a6f144efc01 (patch) | |
| tree | 7dd2d29a674747b8b73e1054220ecc6ab84b53c5 /.gitignore | |
| parent | a19c714cb409204f89cd3ee27d45e75dba37e593 (diff) | |
| parent | 185bdcaad8eaf6a514630293a10d949187e6bd54 (diff) | |
Merge remote-tracking branch 'origin/4.10'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
Change-Id: I7d9ecd6d8518699d848ac72a62e5c35c2cc2751f
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 3a5b611b28..fa9097edfc 100644 --- a/.gitignore +++ b/.gitignore @@ -45,7 +45,7 @@ wrapper.sh *.pyqtc.user* *.qbs.user* *.qmlproject.user* -CMakeLists.txt.user +CMakeLists.txt.user* /share/qtcreator/examples/ /share/qtcreator/externaltools/ /share/qtcreator/fonts/ |