diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-06-25 11:17:32 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-06-25 13:04:27 +0200 |
| commit | 6657d8b925aa92161398e98418bcb06d67170591 (patch) | |
| tree | 4c6afb6d232c6ed8aab732763ef895e8bd85ec55 /src/gui/rhi/qshader_p.h | |
| parent | 79bdc7cf1daec75df59de9236599a9f24077511a (diff) | |
| parent | ef37ab9970ffb9347bc95a3e6006de956c0155c9 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12' into dev"
Diffstat (limited to 'src/gui/rhi/qshader_p.h')
0 files changed, 0 insertions, 0 deletions