diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-05-15 14:49:11 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-05-15 14:49:11 +0200 |
| commit | 52b7ec058b4cd18b1da3944c1e69a583a56aba63 (patch) | |
| tree | 63a641735dee9e94363c16a6b9833f5e2ea8beb8 /.gitignore | |
| parent | 7414a47825895ac8a779911e3d641d782686b6c9 (diff) | |
| parent | 921b56cd468b14f322cbb9e9441f1e32326b0b46 (diff) | |
Merge remote-tracking branch 'origin/4.12'
Conflicts:
src/plugins/mcusupport/mcusupportsdk.cpp
Change-Id: I1583fa81adc0218ad4657baa347c08e9e29f88e6
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index fb1a7e648e..c9064490e9 100644 --- a/.gitignore +++ b/.gitignore @@ -127,6 +127,7 @@ compile_commands.json /doc/html/qtcreator/ /doc/html/qtcreator-dev/ /doc/html/qtdesignstudio/ +/doc/qtdesignstudio/doc/html /lib/ /lib64/ /libexec/ |