Gunnar Sletta ce5ac7d67b Merge branch 'refactor' ... Conflicts: src/declarative/items/context2d/qsgcanvasitem.cpp src/declarative/items/context2d/qsgcontext2d.cpp src/declarative/items/context2d/qsgcontext2d_p_p.h src/declarative/particles/qsgcustomparticle.cpp src/declarative/particles/qsgparticlesystem.cpp Change-Id: I24e81d3652368c5031305ffa7f969f9f2c249c6c		2011-09-13 10:22:22 +02:00
..
declarative	Merge branch 'refactor'	2011-09-13 10:22:22 +02:00
embedded	Remove references to demos.	2011-07-11 09:23:00 +02:00
qmltest	Update licenseheader text in source files for qtdeclarative Qt module	2011-07-08 02:45:03 +02:00
tutorials/gettingStarted/gsQml	Squashed commit of the changes from the mobile-examples repository	2011-05-23 14:27:58 +02:00
examples.pro	Integrate QtQuickTest into Qt	2011-05-20 12:07:23 +10:00