diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-07-05 11:14:33 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-07-05 11:14:33 +0200 |
| commit | 5c81a65422427289f0671b2f2b4d7e809105cbd7 (patch) | |
| tree | 1ec9cd86aaa14511db73bb60bc7e48312854c31f /src/shared | |
| parent | aa4407e332f62f2cb24dd8e8fb41d2469efba1fb (diff) | |
| parent | 9bbb085718ca1af4f816331d450b2129e30ff281 (diff) | |
Merge remote-tracking branch 'origin/4.7'
Conflicts:
qbs/modules/qtc/qtc.qbs
qtcreator.pri
Change-Id: I29916313f12e25f3942ac926f8e4d4490074978e
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 29420ab4698ad45de994cf367b94f23ddc87420 +Subproject 872e4b883d7732c46e1e5d32b60ce698862e5da |