diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-12 11:00:27 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-12 11:00:27 (GMT) |
commit | f863591b4e4aaddb65ea7119dda0d04aa13753b5 (patch) | |
tree | 7c7053c7e3b3eef6b688656fc4d2868cfe9737e2 /doc/src/snippets/declarative/qtbinding/functions-cpp | |
parent | b892a9a83181baabc755919b86feaed83677384e (diff) | |
parent | 8bac84cba1cc1de4c3d0b87772168184a2540076 (diff) | |
download | Qt-f863591b4e4aaddb65ea7119dda0d04aa13753b5.zip Qt-f863591b4e4aaddb65ea7119dda0d04aa13753b5.tar.gz Qt-f863591b4e4aaddb65ea7119dda0d04aa13753b5.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Revert "Don't define highp/mediump/lowp if desktop GL has them"
Diffstat (limited to 'doc/src/snippets/declarative/qtbinding/functions-cpp')
0 files changed, 0 insertions, 0 deletions