Merge remote-tracking branch 'origin/stable' into dev
authorFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 24 Jun 2013 20:37:33 +0000 (22:37 +0200)
committerFrederik Gladhorn <frederik.gladhorn@digia.com>
Mon, 24 Jun 2013 20:37:33 +0000 (22:37 +0200)
commited86fb2dbd4d4887e4c7b2d37f7842ac64a5e860
tree0703b80939874a7bb9e7a4028a07d998d866010d
parent2d065ddb53a31c1b717c88902bcdf4f6b24f320f
parent7320f61e8782119a3f95d85f67fb9c7a973d043a
Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I444ed90a02eebe1f68cfa48be5d75544123ab10d
src/quick/items/context2d/qquickcontext2d.cpp