diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-07-28 15:24:14 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-07-28 15:24:14 +0200 |
| commit | c01ddc4660c10e8ddc605602fd623135fb607de0 (patch) | |
| tree | fdf50dee801ce09d2a6d671d558b73d8769870d9 /src/plugins/qmakeandroidsupport | |
| parent | 712297cbf0b73d8af8db3921c646ed252b0c41d7 (diff) | |
| parent | 36968528805d99a746d27f2632cabc1a132e535f (diff) | |
| download | qt-creator-c01ddc4660c10e8ddc605602fd623135fb607de0.tar.gz | |
Merge remote-tracking branch 'origin/4.4'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
src/plugins/qbsprojectmanager/qbsproject.h
Change-Id: I6b9cdf704be95ade02488c8b19582b6621282fb8
Diffstat (limited to 'src/plugins/qmakeandroidsupport')
0 files changed, 0 insertions, 0 deletions