diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-10-19 15:22:37 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-10-19 15:22:37 +0200 |
| commit | 80951d3e59f8b6ff270333692adfe2d65adf6c9c (patch) | |
| tree | 8a5da6c06f7558d847e24dac386bb60775bd7d76 /src/plugins/texteditor/colorpreviewhoverhandler.cpp | |
| parent | af0e135e7328d5672e54d08ba35765308e554f23 (diff) | |
| parent | 436f111a4609462fcaae501b3d6d9b072adbb0b0 (diff) | |
Merge remote-tracking branch 'origin/4.14' into master
Conflicts:
src/plugins/cppeditor/cppquickfix_test.cpp
Change-Id: Ib2984a3b3d9d071d11304b6cf132c2f8cef77e1c
Diffstat (limited to 'src/plugins/texteditor/colorpreviewhoverhandler.cpp')
0 files changed, 0 insertions, 0 deletions