diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-11-01 15:31:19 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-11-01 15:31:19 +0100 |
| commit | 04bd6e39c8991fcb89ab15728f622a5a3ae8f0b2 (patch) | |
| tree | 0517ecde8091d1680651853a4a9d209c0636cffd /src/plugins/ctfvisualizer/ctftracemanager.cpp | |
| parent | c92c255d1043f11478a61c1caae4069e7ef47114 (diff) | |
| parent | a1d22fd2f79afab8b2379f6d93bcb417b9c8e7d5 (diff) | |
| download | qt-creator-04bd6e39c8991fcb89ab15728f622a5a3ae8f0b2.tar.gz | |
Merge remote-tracking branch 'origin/4.11'
Conflicts:
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quick3dnodeinstance.cpp
Change-Id: I8ea57eba526ab830608fd928c28771c5441749f8
Diffstat (limited to 'src/plugins/ctfvisualizer/ctftracemanager.cpp')
0 files changed, 0 insertions, 0 deletions