Merge branch 'master' into qtquick2
authorGunnar Sletta <gunnar.sletta@nokia.com>
Thu, 9 Jun 2011 07:37:42 +0000 (09:37 +0200)
committerGunnar Sletta <gunnar.sletta@nokia.com>
Thu, 9 Jun 2011 07:37:42 +0000 (09:37 +0200)
1  2 
src/declarative/items/qsgcanvas.cpp
src/declarative/items/qsgcanvas_p.h

Simple merge
Simple merge