diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-27 05:53:51 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-27 05:53:51 (GMT) |
commit | 46194955b223b65b08c300325d6de0620817aa04 (patch) | |
tree | dd974c2c48ad0e69a13d3f60caa213510e32e72f /doc/src/snippets/sqldatabase/sqldatabase.pro | |
parent | e5aa5a9d7e97b975316b8cc18554743cccf06474 (diff) | |
parent | 1744a94ce6a75ead5bb92546f1e0b28dd8a8a05c (diff) | |
download | Qt-46194955b223b65b08c300325d6de0620817aa04.zip Qt-46194955b223b65b08c300325d6de0620817aa04.tar.gz Qt-46194955b223b65b08c300325d6de0620817aa04.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:
Recognize GL_ARB_shader_objects as indicating shaders
Diffstat (limited to 'doc/src/snippets/sqldatabase/sqldatabase.pro')
0 files changed, 0 insertions, 0 deletions