diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-08-09 22:47:08 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-08-09 22:47:08 +0200 |
| commit | dcc6b454718c5e58c31d3699d2c7a5e8de195d5f (patch) | |
| tree | b10ff6845c6ad89e669df17733258bc3b1afa73f /tests/auto/revisions/revisions.pro | |
| parent | 39d6ede82375aeffb8615f48963f1e95815b3b51 (diff) | |
| parent | 6e8533b741f4fd527f17d17e7730489661ae91a5 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
src/imports/controls/material/ComboBox.qml
Change-Id: Ie517a07a63cd74ce2d506a68ee24060dce977bf7
Diffstat (limited to 'tests/auto/revisions/revisions.pro')
0 files changed, 0 insertions, 0 deletions