diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-10 23:39:30 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-10 23:39:30 (GMT) |
| commit | 65f138ac6b8472ace226e769062f6aa92ebf9480 (patch) | |
| tree | cc40f68dc47fb9f819ffac2eba26da5ae75bcfb1 /doc/src/snippets/textdocument-css/main.cpp | |
| parent | 9ab069286660101e2a2a6b49587bc21a69339e77 (diff) | |
| parent | 03bb8fb0af66a24c2b532d2fe6febb426c64f684 (diff) | |
| download | Qt-65f138ac6b8472ace226e769062f6aa92ebf9480.zip Qt-65f138ac6b8472ace226e769062f6aa92ebf9480.tar.gz Qt-65f138ac6b8472ace226e769062f6aa92ebf9480.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Update QTextOdfWriter test case to match actual (correct) output
Diffstat (limited to 'doc/src/snippets/textdocument-css/main.cpp')
0 files changed, 0 insertions, 0 deletions