diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-03-30 17:27:55 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-03-30 17:27:55 +0200 |
| commit | 9a149e295be2d7d1f7369f2ca625c56ac925f3af (patch) | |
| tree | aae4714224e0dc9a6601f565a4137554ca3b7879 /src/shared | |
| parent | 4e199eed8d0bbe175babec209e0435ef60e82022 (diff) | |
| parent | 41099a5eedd0f7c17185b9944c5f209b2588afc0 (diff) | |
Merge remote-tracking branch 'origin/4.12'
Conflicts:
src/tools/qml2puppet/CMakeLists.txt
Change-Id: Id6243b0f725a68075d789bf35e771113b742645b
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 dcd57b60f8a79a2ee9c46cb5fddf60846302d37 +Subproject ee44dae4f53d3c3fd16025c8d717f2508431307 |