diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-23 11:41:52 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-23 11:41:52 +0100 |
| commit | 3998f30603581075214f5ed133493a804c9e65f6 (patch) | |
| tree | db8ce1c96102d7fb8c1ecf1bd3561f18d5ceb358 /examples/quick/controls/filesystembrowser/main.qml | |
| parent | 22272718f2d1d256ed51bc50b5b5d63e781a32fe (diff) | |
| parent | 3ac0be60ce9ed9985e40066ba1c8612125582d35 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/layouts/qquicklinearlayout_p.h
Change-Id: I6a1777e5d097790edbd442058f12bea0ba337d65
Diffstat (limited to 'examples/quick/controls/filesystembrowser/main.qml')
0 files changed, 0 insertions, 0 deletions