diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-02-04 15:21:55 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-02-04 15:21:55 +0100 |
| commit | 88b29792cbb7899c4179bc95e6468b7afbd81c6f (patch) | |
| tree | 2ce53e1c7f581ef8385a5d83513b0ef80f346eb7 /src/plugins/cpptools/baseeditordocumentprocessor.cpp | |
| parent | 7dba3f083cad8d2a864c2a41e16cab5ec446dc26 (diff) | |
| parent | ffa14187a1a6876cabe14a19513462117de68594 (diff) | |
| download | qt-creator-88b29792cbb7899c4179bc95e6468b7afbd81c6f.tar.gz | |
Merge remote-tracking branch 'origin/4.8' into 4.9
Conflicts:
src/plugins/android/androidrunnerworker.cpp
src/plugins/android/androidrunnerworker.h
Change-Id: I52b9117c8a57dc4a34cfc09d1ae9bc76e0752bfc
Diffstat (limited to 'src/plugins/cpptools/baseeditordocumentprocessor.cpp')
0 files changed, 0 insertions, 0 deletions