diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-09-30 14:59:22 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-30 14:59:22 +0200 |
| commit | eb9f68599f1d94b8ee578ea18b3e3e5297cce73d (patch) | |
| tree | ab4d226556f83de7e24246f1995500be51533f04 /src/render/renderers/opengl/renderer/renderer.cpp | |
| parent | 4bae053c5dd756444c415bd6ddb121f7e3873b83 (diff) | |
| parent | c40cccb0b4485045db61c2d4e825e33a68c58861 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/render/texture/qtexture.cpp
Change-Id: Ibc0b8d87c172ea8fac521b2c85d2b2a42c5fc290
Diffstat (limited to 'src/render/renderers/opengl/renderer/renderer.cpp')
0 files changed, 0 insertions, 0 deletions