diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-17 23:00:12 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-17 23:00:12 (GMT) |
| commit | ab9d11946e5ff88008e8c2d887b8d0458ab9a98c (patch) | |
| tree | 41642e36b440b5e326a2dd56e2dca041ddb52908 /tests/auto/declarative/qdeclarativeimage/data | |
| parent | 432cd48a777fddc04f4c323df5876bcc6c0c2829 (diff) | |
| parent | 0d3786a9cd6dc3c4dd17a7e98fe138a7abaabb29 (diff) | |
| download | Qt-ab9d11946e5ff88008e8c2d887b8d0458ab9a98c.zip Qt-ab9d11946e5ff88008e8c2d887b8d0458ab9a98c.tar.gz Qt-ab9d11946e5ff88008e8c2d887b8d0458ab9a98c.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'tests/auto/declarative/qdeclarativeimage/data')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeimage/data/heart.png | bin | 12424 -> 12577 bytes |
| -rw-r--r-- | tests/auto/declarative/qdeclarativeimage/data/heart200.png | bin | 7943 -> 8063 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativeimage/data/heart.png b/tests/auto/declarative/qdeclarativeimage/data/heart.png Binary files differindex ff93f6c..abe97fe 100644 --- a/tests/auto/declarative/qdeclarativeimage/data/heart.png +++ b/tests/auto/declarative/qdeclarativeimage/data/heart.png diff --git a/tests/auto/declarative/qdeclarativeimage/data/heart200.png b/tests/auto/declarative/qdeclarativeimage/data/heart200.png Binary files differindex 5a31ae8..7fbb13c 100644 --- a/tests/auto/declarative/qdeclarativeimage/data/heart200.png +++ b/tests/auto/declarative/qdeclarativeimage/data/heart200.png |
