diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-19 00:42:49 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-19 00:42:49 (GMT) |
| commit | 7ead8996874ab5504dcd24e9fbe1b55557a85233 (patch) | |
| tree | 8d67a63878c41d366f99fd845d276c57a92b9555 /doc/src/snippets/code/src_opengl_qglshaderprogram.cpp | |
| parent | 3cb3c9a7922cd96744ff0e15790103dbb68b3bf9 (diff) | |
| parent | 8487d464bfa8f78f2e5c86ce4cfae499b4bc5ac0 (diff) | |
| download | Qt-7ead8996874ab5504dcd24e9fbe1b55557a85233.zip Qt-7ead8996874ab5504dcd24e9fbe1b55557a85233.tar.gz Qt-7ead8996874ab5504dcd24e9fbe1b55557a85233.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