diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-19 00:04:04 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-19 00:04:04 +0200 |
| commit | e8c7d2f5abe63d749714c3f36491079ee5ee0968 (patch) | |
| tree | 3dc15bccb7cc66f9044fd371ce750cdcd022518d /examples/quick/controls/filesystembrowser/main.qml | |
| parent | fa48abf36faa9d1b60c37af441260e6b3d05c37f (diff) | |
| parent | 13aad0cf03170cde6dd147f9d2ce460bac98d712 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/controls/TextArea.qml
Change-Id: I1edc6fa3b51e58d9aa290c9d099cac2e85ea176c
Diffstat (limited to 'examples/quick/controls/filesystembrowser/main.qml')
0 files changed, 0 insertions, 0 deletions