diff options
| author | Kalle Viironen <kalle.viironen@digia.com> | 2014-05-05 12:16:28 +0300 |
|---|---|---|
| committer | Kalle Viironen <kalle.viironen@digia.com> | 2014-05-05 12:16:36 +0300 |
| commit | 3e8d4a6e8d1cf557d923c130bb270a63321a1f53 (patch) | |
| tree | 4733cf488ed39cc779159395982d7e335111751e /basicsuite/launchersettings/main.qml | |
| parent | 63d998641077d9074281f402ae7becb41c037a2c (diff) | |
| parent | ec601d35edd2a3fcc0553db983bdd2a4f4439cdf (diff) | |
Merge branch 'dev' into stable
* dev:
Fix qt5-cinematicdemo on Qt 5.3
Check for multimedia before building camera and qteverywhere demos
The little neato multitocuh flame thing to play with
Change-Id: I42832d3b96fac48d6561fc9f7b1c8cbd26d2fe68
Diffstat (limited to 'basicsuite/launchersettings/main.qml')
0 files changed, 0 insertions, 0 deletions