diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-12 16:09:54 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-12 16:09:54 (GMT) |
commit | dfb0f8600187b44c3a3e10ef40ae2733de88f241 (patch) | |
tree | 519dcb706b5e3a9c42f2062b4b01b1c1b5a302a1 /demos/books/books.pro | |
parent | b05b53cd90ef6dcbf6395ba991e0f848415136aa (diff) | |
parent | 7cd0a90344d340f22b6b2d3afeef092dbaf2cd51 (diff) | |
download | Qt-dfb0f8600187b44c3a3e10ef40ae2733de88f241.zip Qt-dfb0f8600187b44c3a3e10ef40ae2733de88f241.tar.gz Qt-dfb0f8600187b44c3a3e10ef40ae2733de88f241.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' 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 'demos/books/books.pro')
0 files changed, 0 insertions, 0 deletions