Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 22 Apr 2013 14:36:57 +0000 (16:36 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 22 Apr 2013 14:36:57 +0000 (16:36 +0200)
commitc704226b6815df4d989142729bae9fadd14f6f9d
tree4df1121d070b43bd20af27c8f0018e9ced2cf0f9
parentb0c8debfd19ea5752066cb4b933d504b2fa220c5
parent3e3b5709025d3564215cfca4f9aa5da95742a61f
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I8b0be891402530e38efca46f7cbb679eca5d4a9d
src/particles/qquickimageparticle.cpp