Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 31 May 2013 11:48:17 +0000 (13:48 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Fri, 31 May 2013 11:48:36 +0000 (13:48 +0200)
Change-Id: Ie4ce4c3e64f093eec26754e06199d350a46ae2a2

1  2 
src/quick/scenegraph/qsgcontext.cpp

Simple merge