Frederik Gladhorn 72e5124b85 Merge remote-tracking branch 'origin/release' into stable ... Conflicts: tests/auto/opengl/qgl/tst_qgl.cpp Change-Id: I3c601351c984c1f4b00478d3c47ac9eeb021e892		2013-03-08 16:11:33 +01:00
..
qgl	Merge remote-tracking branch 'origin/release' into stable	2013-03-08 16:11:33 +01:00
qglbuffer	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qglfunctions	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qglthreads	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
opengl.pro	Moved tests into gui/kernel/ and gui/qopengl/	2011-11-04 20:48:19 +01:00