summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2019-09-30 10:36:00 +0200
committerEike Ziller <eike.ziller@qt.io>2019-09-30 10:36:00 +0200
commitf8c8c010961a69def8a21cd15c7cd38d07312cc0 (patch)
tree5f7c3485caa496bb9ced8d501b29aacf3bfad3a6 /src/shared
parentb5b1367b0b37133c9666a5d20c95d53e5e6d6a43 (diff)
parent24dd7be6dbc150131db62921e2b5b922e136b8aa (diff)
downloadqt-creator-f8c8c010961a69def8a21cd15c7cd38d07312cc0.tar.gz
Merge remote-tracking branch 'origin/4.10' into 4.11
Change-Id: Ic05bd53ea060d42c2013884972c05de08ed63f10
Diffstat (limited to 'src/shared')
m---------src/shared/qbs0
1 files changed, 0 insertions, 0 deletions
diff --git a/src/shared/qbs b/src/shared/qbs
-Subproject 94fe404a5a6d7cf91926bcfbd026953994b2581
+Subproject aec975a3f95f905b2d63ea1500ace28eddea7b9