summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-03-2742-6883/+10890
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-2218-76/+159
| |\
| * | qdoc: Avoid infinite loops in table of contents generation.David Boddie2011-03-211-1/+4
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-184-183/+185
| |\ \
| | * | qdoc: Added the <othermeta> element.Martin Smith2011-03-183-1/+30
| | * | qdoc: Completed changing <section> structure.Martin Smith2011-03-172-182/+155
| * | | Removed the documentation from the install rule.David Boddie2011-03-181-1/+1
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-153-205/+264
| |\ \ \ | | |/ /
| | * | qdoc: Changed <section> structure.Martin Smith2011-03-153-205/+264
| * | | Doc: Fixed typo.David Boddie2011-03-151-1/+1
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-144-14/+78
| |\ \ \ | | |/ /
| | * | qdoc: Added <publisher> and <permissions> elements.Martin Smith2011-03-103-9/+45
| | * | qdoc: Added <component> element to contain the module name.Martin Smith2011-03-101-1/+6
| | * | qdoc: Added <prodinfo> element and its contents to the metadata.Martin Smith2011-03-092-5/+28
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-084-10/+162
| |\ \ \ | | |/ /
| | * | qdoc: Added Author> and <category> elements to the metadata.Martin Smith2011-03-074-25/+103
| | * | qdoc: Added enum values and tag names for <prolog> and <metadata>Martin Smith2011-03-042-6/+81
| | * | qdoc: Removed debug code.Martin Smith2011-03-021-1/+0
| * | | Fixed invalid HTML output.David Boddie2011-03-031-1/+1
| |/ /
| * | Merge branch 'mimir' into 4.7Martin Smith2011-03-012-1595/+1739
| |\ \
| | * | qdoc: Added more descriptions for QML commands.Martin Smith2011-03-011-138/+156
| | * | qdoc: Added more descriptions for QML commands.Martin Smith2011-03-011-239/+284
| | * | qdoc: Added more descriptions for QML commands.Martin Smith2011-02-281-132/+126
| | * | qdoc: Added more descriptions for QML commands.Martin Smith2011-02-281-8/+69
| | * | qdoc: Added more descriptions for QML commands.Martin Smith2011-02-281-15/+95
| | * | qdoc: Added more descriptions for QML commands.Martin Smith2011-02-251-10/+29
| | * | qdoc: Began adding descriptions for QML commands.Martin Smith2011-02-252-4/+123
| | * | qdoc: More updating command descriptions.Martin Smith2011-02-251-769/+695
| | * | qdoc: More updating command descriptions.Martin Smith2011-02-241-169/+115
| | * | qdoc: More updating command descriptions.Martin Smith2011-02-241-210/+186
| | * | qdoc: More updating command descriptions.Martin Smith2011-02-241-133/+123
| | * | qdoc: More updating command descriptions.Martin Smith2011-02-241-113/+105
| | * | Merge branch 'mimir' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into mimirMartin Smith2011-02-241229-2094/+6243
| | |\ \
| | * | | qdoc: More updating command descriptions.Martin Smith2011-02-241-139/+117
| * | | | Merge commit 'refs/merge-requests/1113' of git://gitorious.org/qt/qt into mer...David Boddie2011-02-281-0/+5
| |\ \ \ \
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-02-241-316/+306
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge branch '4.7' into mimirMorten Engvoldsen2011-02-231229-2094/+6243
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | qdoc: More updating command descriptions.Martin Smith2011-02-231-25/+74
| | * | | | qdoc: More updating command descriptions.Martin Smith2011-02-231-34/+11
| | * | | | qdoc: More updating command descriptions.Martin Smith2011-02-231-257/+221
| * | | | | Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into mer...David Boddie2011-02-238-53/+104
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'mimir' into 4.7David Boddie2011-02-237-4999/+4877
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | qdoc: More updating command descriptions.Martin Smith2011-02-221-111/+80
| | * | | | qdoc: More updating command descriptions.Martin Smith2011-02-221-89/+71
| | * | | | qdoc: More updating command descriptions.Martin Smith2011-02-221-20/+15
| | * | | | qdoc: More updating command descriptions.Martin Smith2011-02-221-83/+77
| | * | | | qdoc: More updating command descriptions.Martin Smith2011-02-221-86/+72
| | * | | | qdoc: More updating command descriptions.Martin Smith2011-02-221-177/+169
| | * | | | qdoc: More updating command descriptions.Martin Smith2011-02-211-100/+101
| | * | | | qdoc: More updating command descriptions.Martin Smith2011-02-211-140/+67