diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-12 21:16:13 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-12 21:16:13 (GMT) |
commit | f2759b6b670632bde2ca5ecfa424c02a7c231e89 (patch) | |
tree | 7a1ba9cafc021c33c0dce5aba85f484949332438 /src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp | |
parent | 25922676886e05b6de40d0d3e7b8daecb433b1fb (diff) | |
parent | 7bf8fb931459c56135feb2d0168431f393259db2 (diff) | |
download | Qt-f2759b6b670632bde2ca5ecfa424c02a7c231e89.zip Qt-f2759b6b670632bde2ca5ecfa424c02a7c231e89.tar.gz Qt-f2759b6b670632bde2ca5ecfa424c02a7c231e89.tar.bz2 |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Revert "Don't define highp/mediump/lowp if desktop GL has them"
Diffstat (limited to 'src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp')
0 files changed, 0 insertions, 0 deletions