diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-01-21 08:54:49 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-01-21 08:54:49 +0100 |
| commit | 845af928896ba1ef1bb7259766913ea7f4c35cd9 (patch) | |
| tree | ba58d1eb878d7c2add1539c54123aab271893915 /src/plugins/cpptools/stringtable.cpp | |
| parent | 650153b8cf87c3e9b7565c37f9a5e0d40590045b (diff) | |
| parent | d8920f923faaf5b8ad827d03e637bad71af645c0 (diff) | |
| download | qt-creator-845af928896ba1ef1bb7259766913ea7f4c35cd9.tar.gz | |
Merge remote-tracking branch 'origin/4.8'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
Change-Id: Iaec96f929230754b87b32c2588db5cac5acd8453
Diffstat (limited to 'src/plugins/cpptools/stringtable.cpp')
0 files changed, 0 insertions, 0 deletions