diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2020-05-27 09:13:15 +0300 |
---|---|---|
committer | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2020-05-27 09:13:18 +0300 |
commit | fcbbcc74654770175650b6b46b39eddebd6358e1 (patch) | |
tree | 28c41582340c3a52c2144c51b800e9cccfcb42e7 /src/plugins/resourceeditor/qrceditor/resourcefile.cpp | |
parent | e4fb3de1650e293ec5181653254684f0559f8255 (diff) | |
parent | d5bfa21dfc2f010269404952f8e5212ca9d69194 (diff) | |
download | qt-creator-fcbbcc74654770175650b6b46b39eddebd6358e1.tar.gz |
Merge remote-tracking branch 'origin/4.12'
Change-Id: If8f433d1084763c1aea4a3454ae163750495c569
Diffstat (limited to 'src/plugins/resourceeditor/qrceditor/resourcefile.cpp')
0 files changed, 0 insertions, 0 deletions