diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-02 10:46:49 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-02 10:46:49 +0100 |
| commit | 38e2fc6b808186b41183b6e4601c086dc81d35bf (patch) | |
| tree | c1b2faecf005d02b94a1f8c2cd423aff3a06c78d /qt3d | |
| parent | da65a37041aa35a719130050cebad3ea0356e059 (diff) | |
| parent | b6283a31c8db19d6d1939957a503e25b98394507 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.gitmodules
coin/provisioning/common/linux/docker_testserver.sh
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh
Done-With: Ryan Chu <ryan.chu@qt.io>
Change-Id: I9bc3afcb50783a9f0f7718731d237de4be287cae
Diffstat (limited to 'qt3d')
0 files changed, 0 insertions, 0 deletions