diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-10-23 07:41:01 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-10-23 07:41:01 +0200 |
| commit | 9760d02b77c31c9ed34bd10703d0fc55b9cdb300 (patch) | |
| tree | 6faf6a17abe30669acd30a7041b8a58b7bddcd86 /src/plugins/ctfvisualizer/ctfvisualizertool.cpp | |
| parent | b8657ac73930bc729d601366b047528847413f9e (diff) | |
| parent | 1b655f76ad61cc17483d00b8ece06e08afaeaf01 (diff) | |
| download | qt-creator-9760d02b77c31c9ed34bd10703d0fc55b9cdb300.tar.gz | |
Merge remote-tracking branch 'origin/4.11'
Conflicts:
src/plugins/perfprofiler/perfprofilerflamegraphmodel.cpp
src/plugins/qtsupport/qtversionmanager.cpp
Change-Id: I2f29dd2e86b028be46184b12ac2c17ace2513d5a
Diffstat (limited to 'src/plugins/ctfvisualizer/ctfvisualizertool.cpp')
0 files changed, 0 insertions, 0 deletions