diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-25 09:59:09 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-25 10:17:38 +0100 |
| commit | 1c52a489c1eed52107cdde28890ca230424bd85b (patch) | |
| tree | 58ddbb1d579e603b8737aeb4ec46131978ca780d /.gitattributes | |
| parent | 4a4b5383e8e2a33db2b95b5540da430df0835125 (diff) | |
| parent | 6c248da9fc6715ed5bf26cb4105792e0b0964da0 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.75.7
Conflicts:
src/core/resources/qframeallocator.cpp
src/plugins/sceneparsers/gltf/gltfparser.cpp
src/render/frontend/qrenderaspect.cpp
tests/auto/render/renderqueue/tst_renderqueue.cpp
Change-Id: Icdc2be2c80e7de6135a09e2f370ee004e395f514
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions