Merge remote-tracking branch 'origin/master' into lighthouse-master
authorJørgen Lind <jorgen.lind@nokia.com>
Thu, 14 Apr 2011 10:23:42 +0000 (12:23 +0200)
committerJørgen Lind <jorgen.lind@nokia.com>
Thu, 14 Apr 2011 10:23:42 +0000 (12:23 +0200)
commitb56444d86aa449e2da15d9b9fd08001f09ac9b25
tree171f6c0be5cc1c2935f15757630c8583bf0b2dd9
parent5f68933c9adbf2dc1d6150d5771c8443395d6780
parent662174b78b7e08c759d0086e215e81e9e0eaf0c5
Merge remote-tracking branch 'origin/master' into lighthouse-master
configure
src/network/access/qhttpthreaddelegate.cpp
src/opengl/opengl.pro
src/opengl/qwindowsurface_gl.cpp
src/opengl/qwindowsurface_gl_p.h