diff options
author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-03 23:00:16 (GMT) |
---|---|---|
committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-03 23:00:16 (GMT) |
commit | a6733f5e70c6a4f3695dc380d1960d59f60e38b9 (patch) | |
tree | 6da80ff96b48224bf33580a9189bf25a638be77e /tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.2.png | |
parent | c343e2139b1764008b812ee6cc3a2a980fa4d147 (diff) | |
parent | 14e4fd08ff67578dccf5e85a88fcadf747ae5852 (diff) | |
download | Qt-a6733f5e70c6a4f3695dc380d1960d59f60e38b9.zip Qt-a6733f5e70c6a4f3695dc380d1960d59f60e38b9.tar.gz Qt-a6733f5e70c6a4f3695dc380d1960d59f60e38b9.tar.bz2 |
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.2.png')
-rw-r--r-- | tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.2.png | bin | 3688 -> 3676 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.2.png Binary files differindex bcad242..33328db 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.2.png +++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.2.png |