diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2011-02-21 17:24:01 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2011-02-21 17:24:01 (GMT) |
| commit | 4246616b831da16cf59c57d36148bcfb3a34573c (patch) | |
| tree | 2a16854ff60a1ab1ba6949f7dba67676e1ee2f23 /doc/src/snippets/qlabel/main.cpp | |
| parent | 9afac62064df735fa4667f61ce4fbda5289c94d9 (diff) | |
| parent | 1d054b71a4a97d197f345e100e1dc9ed8712199a (diff) | |
| download | Qt-4246616b831da16cf59c57d36148bcfb3a34573c.zip Qt-4246616b831da16cf59c57d36148bcfb3a34573c.tar.gz Qt-4246616b831da16cf59c57d36148bcfb3a34573c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Conflicts:
doc/src/index.qdoc
Diffstat (limited to 'doc/src/snippets/qlabel/main.cpp')
0 files changed, 0 insertions, 0 deletions