diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-09 16:37:26 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-09 16:37:26 (GMT) |
| commit | 4c1c1b502ecaa2add525362e97629a58969adb0f (patch) | |
| tree | 57b6efea84cfcee3a151d5e82aec259cb2040fd4 /doc/src/snippets/code/src_opengl_qglshaderprogram.cpp | |
| parent | 3d7252234b86cbf791dd1bb747befcaab688877f (diff) | |
| parent | ab620c451c30e05e8667ed9c8ec813c99738253d (diff) | |
| download | Qt-4c1c1b502ecaa2add525362e97629a58969adb0f.zip Qt-4c1c1b502ecaa2add525362e97629a58969adb0f.tar.gz Qt-4c1c1b502ecaa2add525362e97629a58969adb0f.tar.bz2 | |
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
sync win32-g++-cross with win32-g++ (lib prefix and extension)
Diffstat (limited to 'doc/src/snippets/code/src_opengl_qglshaderprogram.cpp')
0 files changed, 0 insertions, 0 deletions