diff options
author | Peter Yard <peter.yard@nokia.com> | 2010-11-22 04:51:16 (GMT) |
---|---|---|
committer | Peter Yard <peter.yard@nokia.com> | 2010-11-22 04:51:16 (GMT) |
commit | e4649285568769d7dd698446f07086197c956df0 (patch) | |
tree | 27bc8235d980b1cdedcdd91df359e0b9dc53e5c9 /tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.12.png | |
parent | e6a09f87f3224588324218b6f9498bee81d178fc (diff) | |
parent | cbedbc4455eecea670988b635af4ee90d01cfab3 (diff) | |
download | Qt-e4649285568769d7dd698446f07086197c956df0.zip Qt-e4649285568769d7dd698446f07086197c956df0.tar.gz Qt-e4649285568769d7dd698446f07086197c956df0.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.12.png')
-rw-r--r-- | tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.12.png | bin | 2020 -> 2032 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.12.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.12.png Binary files differindex 56f6ece..8effaef 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.12.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.12.png |