Merge remote-tracking branch 'origin/master' into refactor
authorLars Knoll <lars.knoll@nokia.com>
Wed, 31 Aug 2011 12:03:16 +0000 (14:03 +0200)
committerLars Knoll <lars.knoll@nokia.com>
Wed, 31 Aug 2011 12:03:16 +0000 (14:03 +0200)
commit20c3575fc39004d6a556820543982f4a6ebef0be
tree9d8be9faae42972c85f0e296cc6dcaf27c3fcc4e
parent71478352376022faa9be6d79f2a760c289945ff5
parent3108a36914d59d8a0d15bfdb2b5bbb09aa6e54a2
Merge remote-tracking branch 'origin/master' into refactor

Conflicts:
src/declarative/declarative.pro

Change-Id: I9c6d8447e1254c6acd32fa0775ff6a79d0d66acd
src/declarative/declarative.pro
src/declarative/particles/qsgimageparticle.cpp