diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-16 00:17:04 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-16 00:17:04 (GMT) |
| commit | b47c7a1a85ce0b6d9340db1ff95d4176e77ba64e (patch) | |
| tree | 17f0144f3f03a5f8d197a91060d14124b6d40d2a /doc/src/snippets/code/src_opengl_qglshaderprogram.cpp | |
| parent | eccddae15a5e675e3b72a72b10457a5e9ea340b7 (diff) | |
| parent | 67470969199a975a5e4bdb8b202523e48b97ca45 (diff) | |
| download | Qt-b47c7a1a85ce0b6d9340db1ff95d4176e77ba64e.zip Qt-b47c7a1a85ce0b6d9340db1ff95d4176e77ba64e.tar.gz Qt-b47c7a1a85ce0b6d9340db1ff95d4176e77ba64e.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
use same small color dialog on S60 and Maemo 5
fix qm generation under windows
Diffstat (limited to 'doc/src/snippets/code/src_opengl_qglshaderprogram.cpp')
0 files changed, 0 insertions, 0 deletions