aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/doc
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-06-24 22:37:33 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-06-24 22:37:33 +0200
commited86fb2dbd4d4887e4c7b2d37f7842ac64a5e860 (patch)
tree0703b80939874a7bb9e7a4028a07d998d866010d /src/quick/doc
parent2d065ddb53a31c1b717c88902bcdf4f6b24f320f (diff)
parent7320f61e8782119a3f95d85f67fb9c7a973d043a (diff)
Merge remote-tracking branch 'origin/stable' into dev
Diffstat (limited to 'src/quick/doc')
-rw-r--r--src/quick/doc/images/qml-item-canvas.arc.png (renamed from src/quick/doc/images/qml-item-canvas-arcTo2.png)bin6532 -> 6532 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/src/quick/doc/images/qml-item-canvas-arcTo2.png b/src/quick/doc/images/qml-item-canvas.arc.png
index 5f9d32d8d3..5f9d32d8d3 100644
--- a/src/quick/doc/images/qml-item-canvas-arcTo2.png
+++ b/src/quick/doc/images/qml-item-canvas.arc.png
Binary files differ