diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-17 09:52:15 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-17 09:52:15 +0100 |
| commit | aa55356a840cf1b76aea9b6e6137717dfdeff75c (patch) | |
| tree | 48217f4019867899716fa2ab9bfdd240d98af28b /src | |
| parent | 3ad671581149d22eaa2f1562f32cea754bfb1087 (diff) | |
| parent | 46a55f2a75b67c477c7fd0d8d706906475e7ec55 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
doc/config/qt-html-templates-online.qdocconf
doc/config/qt-html-templates.qdocconf
doc/config/qtsensors.qdocconf
Change-Id: Iaf258dbe5311c1f3e190e4b2bff5297f1d4e290e
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions