diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:04:47 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-29 16:04:47 +0100 |
| commit | c669f95302fecb4b21d3b658d3b1d42efb3cc7e8 (patch) | |
| tree | 496fc6ccdd52dbe8b65f3d7f5b7d72d43af703ae /examples/quick/dialogs/systemdialogs/FileDialogs.qml | |
| parent | 8cc5e5ecd7ebea89a6a4c2f931d6774255911df7 (diff) | |
| parent | 1070aeb5521a95039cad3f4536e85e99526a4900 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
Change-Id: I626baf91e8bb9e9816346fdb842c0d577ca23d77
Diffstat (limited to 'examples/quick/dialogs/systemdialogs/FileDialogs.qml')
0 files changed, 0 insertions, 0 deletions