diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-22 09:47:06 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-22 09:47:06 +0200 |
| commit | 9a216c3f7abeacae8b9e9f78e50ddfcfbb5e2fa3 (patch) | |
| tree | ec1eb5ec4225b596dca92df654d58b72a229d8a6 /src/declarative/graphicsitems/qdeclarativetext.cpp | |
| parent | d22741b4bee0e526aefbbd7b851c2aa1b0b1c5b6 (diff) | |
| parent | 4e6790c8dc21c5287bff6799fb0984a72e2f2766 (diff) | |
| download | qt4-tools-9a216c3f7abeacae8b9e9f78e50ddfcfbb5e2fa3.tar.gz | |
Merge remote branch 'lighthouse/4.7' into lighthouse-master
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetext.cpp')
0 files changed, 0 insertions, 0 deletions