diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-03 10:20:42 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-03 10:22:36 +0200 |
commit | a2dc8d6c2141bce84fe9619d5ee6851e73de8a95 (patch) | |
tree | bfd83a337c4bca328030fd64999129a559791be0 /qtshadertools | |
parent | 318d651b446a5f0f56798c4074c2c20f6d9e1944 (diff) | |
parent | a10584e57c1be4149b3a067de86fa61c44b8a757 (diff) | |
download | qt5-a2dc8d6c2141bce84fe9619d5ee6851e73de8a95.tar.gz |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Bringing in new SHA1s, while keeping wip/cmake's own configurations.
Intended for Qt6 Installer essentials package creation.
Conflicts
coin/platform_configs/default.yaml
Change-Id: I40e26301cf10c3c7bd8b0b4dc11cc47eedc1700e
Diffstat (limited to 'qtshadertools')
m--------- | qtshadertools | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/qtshadertools b/qtshadertools -Subproject 7305d0c82df5af38e4a4f26731391b923e281d3 +Subproject d8aa3fb504723a2ebf54d0eae5c5e6b633826b3 |