Merge branch 'master' into qtquick2
authorGunnar Sletta <gunnar.sletta@nokia.com>
Wed, 4 May 2011 09:38:59 +0000 (11:38 +0200)
committerGunnar Sletta <gunnar.sletta@nokia.com>
Wed, 4 May 2011 09:38:59 +0000 (11:38 +0200)
commit01285af37aafa00a1bf3fbd7654b1ec5e057775d
treeb3c421716c3bc6892b565a096a8ec5be837cd267
parent16f58282bc5a1f81f7346ac6560df68761ad277d
parentdbbcc4dff099d5cf41a3253f922b785889e17545
Merge branch 'master' into qtquick2

Conflicts:
src/imports/particles/particles.pro
modules/qt_declarative.pri
src/declarative/declarative.pro
src/imports/particles/particles.pro