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

1  2 
src/quick/scenegraph/qsgcontext.cpp
src/quick/scenegraph/qsgcontext_p.h

Simple merge
Simple merge