diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-12-13 23:28:56 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-12-13 23:28:56 +0100 |
| commit | 475fc2c2ad53252dbc9fb1657dc2c7fe660fcd07 (patch) | |
| tree | 3c2f7e755897fcffc1d2f5d8ac1f2e7261f38b1f /qt3d | |
| parent | eccfaf1f506ceb46016e385c1a2707461811def2 (diff) | |
| parent | b16eac13e6f65f338ec9e78ce4a926edadde8efb (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
.gitmodules
Change-Id: If22ccc401db60d550d6e6b474d54a05b363884af
Diffstat (limited to 'qt3d')
0 files changed, 0 insertions, 0 deletions