summaryrefslogtreecommitdiffstats
path: root/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-12-31 19:07:33 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-12-31 19:07:33 (GMT)
commit4d53a691aaac9789ddd4f9d4e968d28ace2181ca (patch)
treec33106c1a9906cb2a7955ace3a6f3c665f1f55d9 /src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
parent34ea4da9a3c5538f39408367b394044fbd303773 (diff)
parent7dfb420b99180e61efc1b089f47932ac07a4bf36 (diff)
downloadQt-4d53a691aaac9789ddd4f9d4e968d28ace2181ca.zip
Qt-4d53a691aaac9789ddd4f9d4e968d28ace2181ca.tar.gz
Qt-4d53a691aaac9789ddd4f9d4e968d28ace2181ca.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: Fixed networkselftest failing to resolve hostname
Diffstat (limited to 'src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp')
0 files changed, 0 insertions, 0 deletions