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
..
.gitignore	Moved autotests in category 'opengl' into new directory structure	2011-09-09 10:32:38 +02:00
qgl.pro	add and use qtHaveModule() function	2012-12-21 19:05:02 +01:00
qgl.qrc	Moved autotests in category 'opengl' into new directory structure	2011-09-09 10:32:38 +02:00
tst_qgl.cpp	Merge remote-tracking branch 'origin/release' into stable	2013-03-08 16:11:33 +01:00