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)
Change-Id: Iafc0497812acb7850cd4e72c49d63ec9c9320b58

1  2 
src/quick/scenegraph/qsgcontext.cpp

Simple merge