Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 4 Mar 2013 17:17:10 +0000 (18:17 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Mon, 4 Mar 2013 17:17:10 +0000 (18:17 +0100)
commit3e0dc9ef3894c39fc617c96eecbd419a7a2fefa4
tree6982bea25e173186d356a60545544ab54d2d3da2
parent3b507d2c48a1637966a6e7537af7763824f0bef8
parent15dc45ce109fe41699950a9b87282901b21f2d3d
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
src/quick/scenegraph/util/qsgtexturematerial.h
tests/auto/quick/quick.pro