diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-02-21 15:47:12 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-02-21 15:47:12 (GMT) |
| commit | ca3e426ec9e838f5f6051e9f74622159e878560b (patch) | |
| tree | a632c46e90e56bdd134b6f109f2bc408260c9629 /doc/src/snippets/code/src_gui_text_qtextdocument.cpp | |
| parent | c4013fc89cb9b9f7674893dea7e24415382d488c (diff) | |
| parent | 6bc32422044bf956d57301c934d5e90ebc977b22 (diff) | |
| download | Qt-ca3e426ec9e838f5f6051e9f74622159e878560b.zip Qt-ca3e426ec9e838f5f6051e9f74622159e878560b.tar.gz Qt-ca3e426ec9e838f5f6051e9f74622159e878560b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Conflicts:
doc/src/platforms/supported-platforms.qdoc
Diffstat (limited to 'doc/src/snippets/code/src_gui_text_qtextdocument.cpp')
0 files changed, 0 insertions, 0 deletions