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)
commit7e73dc01f85355e23a4ee07c0b624b253541acdc
treea59b33bfbc2b11d72e9a12324c105bf7a367eec9
parente171d1e8c4b4324374cb57a6d7d181a57fc17dbe
parente840b9e2c56a786ef7c4232b8fb2f1df1b285da4
Merge remote-tracking branch 'origin/release' into stable

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