diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-12-14 13:01:13 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-12-14 13:01:13 (GMT) |
| commit | 086a010a63895c6e6d178c1de9434483f11b2d34 (patch) | |
| tree | bb2542f04438b42ae5c61b1c3a6330f011700474 /tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.6.png | |
| parent | 0fe36ac832abf8f8d438b21fce0177b65b3bbf3a (diff) | |
| parent | 5cb2226ddf96555417f08c9bfe35addfc93f6acd (diff) | |
| download | Qt-086a010a63895c6e6d178c1de9434483f11b2d34.zip Qt-086a010a63895c6e6d178c1de9434483f11b2d34.tar.gz Qt-086a010a63895c6e6d178c1de9434483f11b2d34.tar.bz2 | |
Merge branch 'qdoc-simplified' into mimir-simplified
Conflicts:
tools/qdoc3/atom.h
tools/qdoc3/qdoc3.pro
Diffstat (limited to 'tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.6.png')
| -rw-r--r-- | tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.6.png | bin | 1234 -> 1241 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.6.png b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.6.png Binary files differindex 76e3c6f..17da643 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.6.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.6.png |
