diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-22 21:15:52 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-22 21:15:52 +0200 |
| commit | 04ccf0e8dbdb9620ea2e850e5f1cc35a96cf95b6 (patch) | |
| tree | ad43c2b5c1f89c763854f72dc14e72d18b97faac /qt3d | |
| parent | 6c4eb77aa0f8b07bb48d74ede633c6bc56d1a75c (diff) | |
| parent | e7472f43087921c3d83ff4452bbdb67ed27ed604 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
42b502f is not needed for branches >= 5.8, configure.exe does not
exist anymore.
30660bf was not applied to 5.9 branch, the scripts were not
adapted to new template.
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
Change-Id: Ie3681d5f641e99a074368f21b7f85fe31beacc17
Diffstat (limited to 'qt3d')
0 files changed, 0 insertions, 0 deletions