Frederik Gladhorn 6bf6c12854 Merge remote-tracking branch 'origin/release' into stable ... Change-Id: Iaa321deb9e536ce89b87a337b57634f00c770a32		2013-01-22 18:32:47 +01:00
..
cube.png	Squashed commit of changes from the 4.8-temp branch.	2011-05-23 14:24:07 +02:00
cube.pro	add and use qtHaveModule() function	2012-12-21 19:05:02 +01:00
fshader.glsl	Squashed commit of changes from the 4.8-temp branch.	2011-05-23 14:24:07 +02:00
geometryengine.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
geometryengine.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
main.cpp	Merge remote-tracking branch 'origin/release' into stable	2013-01-22 18:32:47 +01:00
mainwidget.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
mainwidget.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
shaders.qrc	Squashed commit of changes from the 4.8-temp branch.	2011-05-23 14:24:07 +02:00
textures.qrc	Squashed commit of changes from the 4.8-temp branch.	2011-05-23 14:24:07 +02:00
vshader.glsl	Squashed commit of changes from the 4.8-temp branch.	2011-05-23 14:24:07 +02:00