diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-07-05 11:14:33 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-07-05 11:14:33 +0200 |
| commit | 5c81a65422427289f0671b2f2b4d7e809105cbd7 (patch) | |
| tree | 1ec9cd86aaa14511db73bb60bc7e48312854c31f /src/libs/utils/images/locked@2x.png | |
| parent | aa4407e332f62f2cb24dd8e8fb41d2469efba1fb (diff) | |
| parent | 9bbb085718ca1af4f816331d450b2129e30ff281 (diff) | |
| download | qt-creator-5c81a65422427289f0671b2f2b4d7e809105cbd7.tar.gz | |
Merge remote-tracking branch 'origin/4.7'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
Change-Id: I29916313f12e25f3942ac926f8e4d4490074978e
Diffstat (limited to 'src/libs/utils/images/locked@2x.png')
0 files changed, 0 insertions, 0 deletions