diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-06-28 10:28:16 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-06-28 10:28:16 +0200 |
| commit | e4a62670369f476cede692c3c71c8426206d2d43 (patch) | |
| tree | 46b668ef01ee8a05004dbc1883d5cd424d9d6ebb /src/plugins/diffeditor/diffeditorplugin.cpp | |
| parent | b57372f2b54676f1aa67e4bc3ece5b57cf7aa0ef (diff) | |
| parent | a72b38b8c9f26c375ee0e6e348d4c3a32af16c25 (diff) | |
| download | qt-creator-e4a62670369f476cede692c3c71c8426206d2d43.tar.gz | |
Merge remote-tracking branch 'origin/4.3'
Conflicts:
src/shared/qbs
Change-Id: I521ed7703298062d3860ddce3c82444bedd49e60
Diffstat (limited to 'src/plugins/diffeditor/diffeditorplugin.cpp')
0 files changed, 0 insertions, 0 deletions