diff options
author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-19 00:00:10 (GMT) |
---|---|---|
committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-19 00:00:10 (GMT) |
commit | 2b417c9b7c878bbf49e685509b0e4b411f7b00ba (patch) | |
tree | c6ee5716f1ca5529ddbadbca6e0b92e25babd881 /tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext.qml | |
parent | 5ed8a8f0a6ff2dbb4d0836d58d3916a04cca8d4b (diff) | |
parent | fdd3fca40a3fc31762b637952884903816b50786 (diff) | |
download | Qt-2b417c9b7c878bbf49e685509b0e4b411f7b00ba.zip Qt-2b417c9b7c878bbf49e685509b0e4b411f7b00ba.tar.gz Qt-2b417c9b7c878bbf49e685509b0e4b411f7b00ba.tar.bz2 |
Merge branch 'master-upstream' into master-water
Diffstat (limited to 'tests/auto/declarative/qmlvisual/qdeclarativetext/font/plaintext.qml')
0 files changed, 0 insertions, 0 deletions