diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-10-03 09:05:21 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-10-03 09:05:58 +0300 |
| commit | e9ac06074db9804fc5d717bcc4ae503b70616fe7 (patch) | |
| tree | 52658d846d3e8bd945cbd950689f4eb2f3c844d3 /src/networksettings/connman/qnetworksettingsmanager_p.cpp | |
| parent | ab2d0161fc9b4c764f8e51f8ec5adcee948815e7 (diff) | |
| parent | 330b6f000ea0e2120a14e43a11dd1d0b68d369a3 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
* origin/5.12:
330b6f0 Drop wpa_supplicant from NetworkSettings
Change-Id: I593834799c5ca47be3bf5d37378e3ccb8a334aed
Diffstat (limited to 'src/networksettings/connman/qnetworksettingsmanager_p.cpp')
0 files changed, 0 insertions, 0 deletions