diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-02-08 12:44:49 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-02-08 12:44:49 +0100 |
| commit | d07d75a08af17305d317b363a7d3044ebeb54a2c (patch) | |
| tree | a86b3526c7b77794e0fd14f231337558e7dd2f0e /src/plugins/android/androidplugin.cpp | |
| parent | dbf7c9f658ce9a0984bd4704b73f02803b062eb2 (diff) | |
| parent | e27744e966d7c689b69f515b60972b0a17acc4ed (diff) | |
| download | qt-creator-d07d75a08af17305d317b363a7d3044ebeb54a2c.tar.gz | |
Merge remote-tracking branch 'origin/4.8' into 4.9
Conflicts:
qtcreator.pri
Change-Id: I84dc8b9c7a029f2f40c4fa3ef78eef338247a6c0
Diffstat (limited to 'src/plugins/android/androidplugin.cpp')
0 files changed, 0 insertions, 0 deletions