diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-01-11 09:29:37 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-01-11 09:29:37 +0100 |
| commit | b1f1ccb32ec31a1c4598e9fd22b23c1548a73299 (patch) | |
| tree | ca92d55857a1552cd926ca858b351a905608ed34 /src/shared | |
| parent | fa84524c0c9b93210e4151cf772375696d0080c6 (diff) | |
| parent | a8230eb6c1a45489f33ffa86498e5ea3452496e1 (diff) | |
Merge remote-tracking branch 'origin/4.2'
Conflicts:
src/plugins/android/androidbuildapkstep.cpp
src/plugins/genericprojectmanager/genericproject.cpp
Change-Id: I3484b668f9323ed0c05de99f8dfed07c9e65ab98
Diffstat (limited to 'src/shared')
| m--------- | src/shared/qbs | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/src/shared/qbs b/src/shared/qbs -Subproject 415b873ea3d930f7853f9cf25f6c403e85e0710 +Subproject a64a0ef5fc454b18a9474b39517a100d8f1fdf3 |