diff options
author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-01-07 07:21:30 (GMT) |
---|---|---|
committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-01-07 07:21:30 (GMT) |
commit | a3c1b0703575ed5fc364011c73dc104ecdb8ef0c (patch) | |
tree | 4e57559b1753c7b1eb3f375aa59eee6ea1108f70 /tests/auto/qimagereader/images/four-frames.gif | |
parent | f9ffe24a87d67f39bb877224f7e2b6f7b3ad6c02 (diff) | |
parent | 7a5bca82738e6b782047e50a813972eccd928307 (diff) | |
download | Qt-a3c1b0703575ed5fc364011c73dc104ecdb8ef0c.zip Qt-a3c1b0703575ed5fc364011c73dc104ecdb8ef0c.tar.gz Qt-a3c1b0703575ed5fc364011c73dc104ecdb8ef0c.tar.bz2 |
Merge branch '4.6' of ../../4.6 into 4.6
Conflicts:
examples/multimedia/audiodevices/audiodevices.cpp
Diffstat (limited to 'tests/auto/qimagereader/images/four-frames.gif')
-rw-r--r-- | tests/auto/qimagereader/images/four-frames.gif | bin | 0 -> 427 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/auto/qimagereader/images/four-frames.gif b/tests/auto/qimagereader/images/four-frames.gif Binary files differnew file mode 100644 index 0000000..6aff2e0 --- /dev/null +++ b/tests/auto/qimagereader/images/four-frames.gif |