summaryrefslogtreecommitdiffstats
path: root/basicsuite/qt5-cinematicdemo/content/SettingsView.qml
diff options
context:
space:
mode:
authorKalle Viironen <kalle.viironen@digia.com>2014-04-28 11:53:55 +0300
committerQt Gerrit Server <srv.gerrit-noreply@digia.com>2014-04-28 11:53:55 +0300
commitcd70f5f95a804370e4da300c134cf615ce60fb46 (patch)
treea21da3151402a382441177c36a262f60cbc9ed6e /basicsuite/qt5-cinematicdemo/content/SettingsView.qml
parent4b889e3e5ff70ec3486852292e504bd6c9a55d4d (diff)
parent6874ceb2b5525d108a0628bff437e697f0fca329 (diff)
Merge "Merge branch 'stable' into dev" into dev
Diffstat (limited to 'basicsuite/qt5-cinematicdemo/content/SettingsView.qml')
0 files changed, 0 insertions, 0 deletions