Merge remote-tracking branch 'upstream/4.8'
authorSergio Ahumada <sergio.ahumada@nokia.com>
Sat, 12 Nov 2011 00:43:31 +0000 (01:43 +0100)
committerSergio Ahumada <sergio.ahumada@nokia.com>
Sat, 12 Nov 2011 00:43:31 +0000 (01:43 +0100)
commitb34884821c9a1e514d831f6aa3dbc1d2156fc755
tree7b038717391da188524329514903f989c347f9b7
parent7acc1316fa4dd32a81bdf185656cb97d6f3fbf11
parent350416c26fccc79621ba986794e6f6b48f2e1fe2
Merge remote-tracking branch 'upstream/4.8'
src/opengl/qwindowsurface_gl.cpp