diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-22 17:49:32 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-22 17:49:32 (GMT) |
commit | 1ac559f5ea335de5d78bef8d991133b95081a1b7 (patch) | |
tree | fa24c691d7001dd7cbc37decde182fe08964b683 /tests/auto/qtimeline | |
parent | 740435592317e1f242ccacf40b8e66a04069013a (diff) | |
parent | 5a669718e9cc0b22eb420eb77dd684e63158a398 (diff) | |
download | Qt-1ac559f5ea335de5d78bef8d991133b95081a1b7.zip Qt-1ac559f5ea335de5d78bef8d991133b95081a1b7.tar.gz Qt-1ac559f5ea335de5d78bef8d991133b95081a1b7.tar.bz2 |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Revert variable overwritten by copying from Qt5
New style sheet for offline (QCH) documentation
New style sheet for offline (QCH) documentation
Diffstat (limited to 'tests/auto/qtimeline')
0 files changed, 0 insertions, 0 deletions