diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-06-17 10:48:32 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-06-17 10:48:37 +0300 |
| commit | d56016b2e2c758404d9a6e288626416a3a050cd4 (patch) | |
| tree | 220fc8ea7ee4e2d5b76dbc5d17a6847000885f33 /src/doc/src/devices/qtee-toradex-colibri-imx6.qdoc | |
| parent | b8b197a757c4cc7cf013d169c82d77f2832ebc71 (diff) | |
| parent | 659266e89ff1ee4ce86ad882907bb623e9f1736b (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
* origin/stable:
b2qt-flashing-wizard: Clear platforms before parsing files
Change-Id: I957bfa157544292dd4d39f5abebb0f50774e3f45
Diffstat (limited to 'src/doc/src/devices/qtee-toradex-colibri-imx6.qdoc')
0 files changed, 0 insertions, 0 deletions