diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-04-26 09:55:15 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-04-26 09:55:36 +0300 |
| commit | 04cecef50d9316d98c11e8b82be5a492ef9bde70 (patch) | |
| tree | dae4cf00b9473cdc274218091e5a29e8ab4f4767 /qml/ViewSettings.qml | |
| parent | 747d70eaa865aad25b0ee680a0090c059a0549a9 (diff) | |
| parent | 8d82e92fcb04d42fa5efbd23e155ac9f076c7c9c (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
* origin/5.12:
8d82e92 Parse individual demo.xml files
Change-Id: Ifb675485bf4ae14390a1ef0641ac23107f67d633
Diffstat (limited to 'qml/ViewSettings.qml')
0 files changed, 0 insertions, 0 deletions