diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-04-06 16:24:22 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-04-06 16:24:46 +0300 |
| commit | 7437efd149c29b8c8ca6acfaf3a5787b2a8f8522 (patch) | |
| tree | f54f4ab8c9cadc2142f2194f69a64e46541da23b /doc | |
| parent | 7767cd8291afdb78bc91bed706fc94899057510c (diff) | |
| parent | 1e2d7ade9c4bb6bee6aca8f716844b4d66d6b033 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
* origin/5.6:
Doc: Language fixes for the demo descriptions
Exclude planets demo on emulator
democompositor: make demo deployable
New icons
qtwebbrowser: add pro file to create stand-alone application
Remove android from exclude list
Exclude canvas3d planets demo from RPi2
Change-Id: Ia84a23bb9daf45d239e4e65e342083fe410303ae
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions