diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-05-12 17:53:48 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-05-12 17:53:48 +0200 |
| commit | 747657c00c07b3989df674051581a94ae584526c (patch) | |
| tree | 4d62f01b354eef0decb996a54b84c15ce9566519 /qtgraphicaleffects | |
| parent | 70bfcf5198928469318468f788371e3f06f5491e (diff) | |
| parent | e4d60dd1171531baa52284590537e9e7ba7c2d4e (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
coin/platform_configs/default.yaml
coin/platform_configs/qt5.yaml
Change-Id: Ic4ed934ea7015dc66472ab2f9dd45844b25522b8
Diffstat (limited to 'qtgraphicaleffects')
| m--------- | qtgraphicaleffects | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject 403342641c4872eac378052a174523a1966553c +Subproject 74c81763391f1292482d46d87ea76f39c9064ee |