Merge branch 'master' into qtquick2
authorGunnar Sletta <gunnar.sletta@nokia.com>
Fri, 10 Jun 2011 11:41:43 +0000 (13:41 +0200)
committerGunnar Sletta <gunnar.sletta@nokia.com>
Fri, 10 Jun 2011 11:41:43 +0000 (13:41 +0200)
commitc86ec2354add60df805ff32278f1e8cacb4811f5
tree9e36a5ddb4cc80fe3757c47bc3c670ef3988ee43
parent53bbcf5038a9ec5c5381e25968cb51b76cf4a2d6
parent4faeb7aa0e33d824afb4db1411e6880140bb828a
Merge branch 'master' into qtquick2
src/declarative/items/qsgcanvas.cpp