Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 10 Jun 2013 08:01:12 +0000 (10:01 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 10 Jun 2013 08:01:27 +0000 (10:01 +0200)
commit8a793defa79bd332742cadeabfe05cbaa5516877
tree85f28038d29452fae858723dc7b7e5f0df9dcb42
parentcbc86ae4d4af719f201e5f62aa07ef4a763eecee
parente4fc75edaedead3092aace3a29a0aafdd0e86a77
Merge remote-tracking branch 'origin/release' into stable

Change-Id: Iafc0497812acb7850cd4e72c49d63ec9c9320b58
src/quick/scenegraph/qsgcontext.cpp