diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-19 03:10:19 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-19 03:10:19 (GMT) |
commit | 76aa88cef4000ae7c635611dd78467195a9f8997 (patch) | |
tree | cc0d6b7dffcfaa22e7f0cdb5bc4171c6ec648c0c /src/opengl/qglextensions.cpp | |
parent | 8a7de547942c9a660dfc45c176ea1a3027bbf99a (diff) | |
parent | 6d727e0f88b82173fd1837fade7cfcd25dbbef4f (diff) | |
download | Qt-76aa88cef4000ae7c635611dd78467195a9f8997.zip Qt-76aa88cef4000ae7c635611dd78467195a9f8997.tar.gz Qt-76aa88cef4000ae7c635611dd78467195a9f8997.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:
Fix double definition of qt_next_power_of_two()
Diffstat (limited to 'src/opengl/qglextensions.cpp')
0 files changed, 0 insertions, 0 deletions