summaryrefslogtreecommitdiffstats
path: root/mkspecs/features/data/cmake
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-01-06 01:00:08 +0100
committerFabian Kosmale <fabian.kosmale@qt.io>2020-01-06 20:13:31 +0000
commit68c30e372b01561e8809fcfa5426ae896da70b8e (patch)
tree68245df2a3616ff0ebf9e132cab0d3c22a586755 /mkspecs/features/data/cmake
parentbd4a1b98b813dfbbb4a9db35a380bed8dd5f0ce3 (diff)
parent3a010f72b81d530df96bfb04e0dd2f13a527cc18 (diff)
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'mkspecs/features/data/cmake')
0 files changed, 0 insertions, 0 deletions