diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2016-12-20 17:14:19 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2016-12-20 17:14:19 +0100 |
| commit | 589fedf45544b1b0e89a69e99d3c8e2e13eedcda (patch) | |
| tree | 5bce5391a9166c621610df7bfc7989d8c1122927 /src/shared | |
| parent | a66fb3f6909b69c0793dc9f3b837c5ee9b7a4209 (diff) | |
| parent | ccc5359c420dd8388cb5a55aa0948b9297027b08 (diff) | |
Merge remote-tracking branch 'origin/4.2'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
src/plugins/projectexplorer/kitinformation.cpp
Change-Id: I94299b069418586db97d1d596a252794e4037556
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 64e336b7af5b863de7e8108448f910370678671 +Subproject 415b873ea3d930f7853f9cf25f6c403e85e0710 |