diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-09-14 11:57:19 +0300 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-09-14 11:58:10 +0300 |
commit | 61e9e8c83e817b3692beae03bd8e683d247207b0 (patch) | |
tree | 6d2314e520d1e07ed82b5a9a116ee2f66d42c7c0 /src/settingsui/display/Display.qml | |
parent | a9e073646307469b5373a0b0ebef36fcf3b59953 (diff) | |
parent | 03b3e6fd62ff9e9a80212a313340e0a0c2f0135f (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10
* origin/5.9:
Add a wifi-example
Change-Id: I84d76aac0320efa46b2146206c5011400a601d28
Diffstat (limited to 'src/settingsui/display/Display.qml')
0 files changed, 0 insertions, 0 deletions