Merge remote-tracking branch 'origin/release' into stable
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 24 Feb 2014 18:55:03 +0000 (19:55 +0100)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 24 Feb 2014 18:55:05 +0000 (19:55 +0100)
commit00be968679152105fece89c3243a457b52d3f268
tree3ca2128e7df8df3a69095f59cc0e384f7848c57e
parent5130f4a679ae38a1d931384188c021112a44065e
parent7ceefa60ab4f79d5f40e7051edf80c1a77ae7734
Merge remote-tracking branch 'origin/release' into stable

Change-Id: I68fd0e1d837bcd918c8efaf67fa88dee4a90b3be
src/quick/scenegraph/qsgcontext.cpp
src/quick/scenegraph/qsgcontext_p.h