diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-11-28 08:24:10 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-11-28 08:24:10 +0100 |
| commit | 6fc85b49fa43c28af6f5726550513fd6974ebae8 (patch) | |
| tree | 74f917f587914a27642fe3b97a6130cbd1fac732 /doc/runframework.dia | |
| parent | 2059cb31f0544626e12b2fa828ca60f27cd8e2d3 (diff) | |
| parent | 6b1d54421e3831576c8d169bf38caf1ab503c84a (diff) | |
| download | qt-creator-6fc85b49fa43c28af6f5726550513fd6974ebae8.tar.gz | |
Merge remote-tracking branch 'origin/4.11'
Conflicts:
src/plugins/designer/codemodelhelpers.cpp
Change-Id: I78906f2fbbfd27d254589a272ebca423b0b80699
Diffstat (limited to 'doc/runframework.dia')
0 files changed, 0 insertions, 0 deletions