diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2014-08-18 21:09:04 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-08-19 00:42:00 +0200 |
| commit | 75b62f3a172c277e8b90ef536da354deccb54d24 (patch) | |
| tree | 2312151dfcaf678dc738062c3b85b32b67b51c44 /src/gui/opengl/qopenglshaderprogram.cpp | |
| parent | 65240c602b2238f090118af816a2b051da7cf032 (diff) | |
| parent | ca524e5b70ccfeb6386cf0c5df83ffb86a8771fe (diff) | |
| download | qtbase-75b62f3a172c277e8b90ef536da354deccb54d24.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4
Diffstat (limited to 'src/gui/opengl/qopenglshaderprogram.cpp')
0 files changed, 0 insertions, 0 deletions