diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-01 10:01:00 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-01 10:01:00 (GMT) |
| commit | 3bc1dc6d3d609166af0532b9f75734aee232cded (patch) | |
| tree | 416c4090917e16d853c7eb6dd9feb52d109c761d /dist/changes-0.99 | |
| parent | 1b4bb02fcb3da77ddfa6281365ba3210aab9daad (diff) | |
| parent | 533e40ca32eefe271e385bb2740e001ffc82b9e6 (diff) | |
| download | Qt-3bc1dc6d3d609166af0532b9f75734aee232cded.zip Qt-3bc1dc6d3d609166af0532b9f75734aee232cded.tar.gz Qt-3bc1dc6d3d609166af0532b9f75734aee232cded.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Placate pedantic compiler warning modes on QGLBuffer
Promote QPixmap::convertFromImage() to public API from Qt3Support
Add the QGLBuffer class to Qt 4.7 for VBO's
Diffstat (limited to 'dist/changes-0.99')
0 files changed, 0 insertions, 0 deletions