diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-01 11:20:50 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-09-01 11:20:50 +0300 |
| commit | 11632ff411c124d60c3b4f57c8a0d4a70cfb4998 (patch) | |
| tree | 1b060eb033008f6a0f6a0f19398e698b076b07f4 /src/doc/src/devices/qtee-intel-nuc.qdoc | |
| parent | c2a9d75aff47d024d249b4d2cedae8307a4cabbb (diff) | |
| parent | eebda51556daae681e9ddb878c36f79e497f5618 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
* origin/5.6:
Doc: Remove generic Device Creation documentation
Conflicts:
src/doc/config/b2qt-project.qdocconf
src/doc/src/devices/qtee-bd-sl-imx6.qdoc
src/doc/src/devices/qtee-beaglebone-black.qdoc
src/doc/src/devices/qtee-kontron-smarc-samx6i.qdoc
src/doc/src/devices/qtee-raspberry-pi.qdoc
src/doc/src/devices/qtee-sabre-sd-imx6.qdoc
src/doc/src/devices/qtee-supported-devices.qdoc
src/doc/src/devices/qtee-toradex-apalis.qdoc
src/doc/src/devices/qtee-toradex-colibri-imx6.qdoc
src/doc/src/devices/qtee-toradex-colibri-vf.qdoc
src/doc/src/qtee-changelog.qdoc
src/doc/src/qtee-custom-embedded-linux.qdoc
src/doc/src/qtee-index.qdoc
src/doc/src/qtee-static-linking.qdoc
src/doc/src/shared/detect-sd-card-device-name.qdocinc
Change-Id: I52b87c5c383c6419a35d06cb2a0c87073c9d3c85
Diffstat (limited to 'src/doc/src/devices/qtee-intel-nuc.qdoc')
0 files changed, 0 insertions, 0 deletions