diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-03-02 01:29:29 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2011-03-02 01:29:29 (GMT) |
| commit | 24b952b353389990cf0064b7657b24be5203188e (patch) | |
| tree | 3abaa1304390ecba2ab175c33c58f3c23e2309af /src/declarative/graphicsitems/qdeclarativetextlayout.cpp | |
| parent | e68b1829384632e4428893e2aad56e9b72ee6fb7 (diff) | |
| parent | 0f924a64646ef22ab4e3df40316c3a0034dc64ca (diff) | |
| download | Qt-24b952b353389990cf0064b7657b24be5203188e.zip Qt-24b952b353389990cf0064b7657b24be5203188e.tar.gz Qt-24b952b353389990cf0064b7657b24be5203188e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativetextlayout.cpp')
0 files changed, 0 insertions, 0 deletions