diff options
| author | Liang Qi <liang.qi@nokia.com> | 2011-07-20 11:01:24 (GMT) |
|---|---|---|
| committer | Liang Qi <liang.qi@nokia.com> | 2011-07-20 11:01:24 (GMT) |
| commit | b7b20e33f36fd942811af33eae906ccdcf486112 (patch) | |
| tree | b79f93c0cb2ef72056a378aec0d28a770ae07b8a /doc/src/snippets/code/src_opengl_qglshaderprogram.cpp | |
| parent | e35c073c72bb297b4760ee4041ce487c08723d14 (diff) | |
| parent | b8205bd9dc0288f66f1c23e9f227e703bc6712bd (diff) | |
| download | Qt-b7b20e33f36fd942811af33eae906ccdcf486112.zip Qt-b7b20e33f36fd942811af33eae906ccdcf486112.tar.gz Qt-b7b20e33f36fd942811af33eae906ccdcf486112.tar.bz2 | |
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
Diffstat (limited to 'doc/src/snippets/code/src_opengl_qglshaderprogram.cpp')
0 files changed, 0 insertions, 0 deletions