diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-11-19 15:24:08 +0100 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-11-19 15:24:08 +0100 |
| commit | e50e811461b54e07184af547f62aa44b3c5bb681 (patch) | |
| tree | 45541bc05471d6c49305afeafa13f69031ccdecd /tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.1.png | |
| parent | 05b65c2f9df1c2c56c72f313401a6adb422d381b (diff) | |
| parent | b115770cc3bba68740a6848c7ccaed932399aca9 (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/gui/text/qfontengine_mac.mm
src/gui/text/qfontengine_p.h
Diffstat (limited to 'tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.1.png')
| -rw-r--r-- | tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.1.png | bin | 0 -> 1244 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.1.png b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.1.png Binary files differnew file mode 100644 index 0000000000..d00d78d6be --- /dev/null +++ b/tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.1.png |