diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-19 16:09:02 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-19 19:27:43 +0100 |
| commit | 5cf1a2f7f4ac4e71b085ef53ff5a05c4676f7ce2 (patch) | |
| tree | eff94d6fba0053177b0f6dac2e93b9ce27cbf294 /tests | |
| parent | 5e8d2b4e266916761a26905f0930add305c308cf (diff) | |
| parent | fbaca62cd0a7309f04bf82101c8e20dbbf423192 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1
Conflicts:
.qmake.conf
src/sensors/doc/src/compatmap.qdoc
Change-Id: I4049bc3c335a8a9db5c935032207d0bcfba78480
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions