diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-09-19 08:27:51 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-09-19 08:27:51 +0200 |
| commit | dd0347d1ee0f077dc5ad03553b7cdece3a881d27 (patch) | |
| tree | 835a9e6e7b7cb0c9c8a0c7ab56c321fae12702b8 /src/plugins/texteditor/syntaxhighlighter.cpp | |
| parent | 0137e2ace9cb5dbd0cc1d1fa3caa25b2454a33eb (diff) | |
| parent | 9c7d546c14517b1167376fee01e815d31a100475 (diff) | |
Merge remote-tracking branch 'origin/4.7'
Conflicts:
src/plugins/qnx/qnxrunconfiguration.cpp
Change-Id: I6069e6a644c6d50c3d2821d51c368129b6957017
Diffstat (limited to 'src/plugins/texteditor/syntaxhighlighter.cpp')
0 files changed, 0 insertions, 0 deletions