diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2011-02-07 17:20:33 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2011-02-07 17:20:33 (GMT) |
| commit | 59a9938f91070ad3699fc6544848f0955ecf0bdd (patch) | |
| tree | 99ad7312ddddf7233290115c7ea5daa3af0b83ec /tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.3.png | |
| parent | b9307547c717606e08661cf474eeaf81cc0789e6 (diff) | |
| parent | 44298c848ac254fe1942eb32eed7651dec5bf0e3 (diff) | |
| download | Qt-59a9938f91070ad3699fc6544848f0955ecf0bdd.zip Qt-59a9938f91070ad3699fc6544848f0955ecf0bdd.tar.gz Qt-59a9938f91070ad3699fc6544848f0955ecf0bdd.tar.bz2 | |
Merge remote branch 'qt/master' into symbian-socket-engine
Conflicts:
src/network/access/qnetworkaccessmanager.cpp
src/network/bearer/qnetworksession.cpp
src/network/kernel/qnetworkproxy_symbian.cpp
src/network/socket/qnativesocketengine_unix.cpp
tests/auto/platformsocketengine/tst_platformsocketengine.cpp
Diffstat (limited to 'tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.3.png')
| -rw-r--r-- | tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.3.png | bin | 1080 -> 1079 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.3.png b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.3.png Binary files differindex c705849..bc6ac34 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.3.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-vertical.3.png |
