summaryrefslogtreecommitdiffstats
path: root/basicsuite/launchersettings/main.qml
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2016-12-12 15:01:31 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2016-12-12 15:02:01 +0200
commit67b8236c15154085adaa9195b818511ad17c06d6 (patch)
treedd1f359c2e3e6f209cc7d3742047b63b4fdabf21 /basicsuite/launchersettings/main.qml
parent9f09b4b3fea17e7ef3a4ce3701e70b480dbd4b0a (diff)
parentf8eb954d797a5f571144c985eb3ac3dc7c2bc885 (diff)
Merge remote-tracking branch 'origin/5.7' into 5.8
* origin/5.7: Remove wildcard in enterprise-gallery demo .pro file Change-Id: Idcaabd1b44e8c8e2e5095860532bbb7a5e8eb302
Diffstat (limited to 'basicsuite/launchersettings/main.qml')
0 files changed, 0 insertions, 0 deletions