diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-18 01:00:08 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-18 01:00:20 +0200 |
| commit | d3de20d4091619dcd9a90ba044cf0d7ea06d4d6e (patch) | |
| tree | df89adfa2a8bd4dea0d90344a648ae8bbc1583be /src/gui/opengl/qopenglshaderprogram.cpp | |
| parent | 8abbbb4c482c32cd5342f5f8576cee8cbacc3737 (diff) | |
| parent | 7576250b1c6d27dcc85e059d6f43830d1767e7f7 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'src/gui/opengl/qopenglshaderprogram.cpp')
0 files changed, 0 insertions, 0 deletions