Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into qt-master-from-4.7 | Thiago Macieira | 2011-03-11 | 7 | -7/+7 |
|\ | |||||
| * | Update copyright year to 2011. | Rohan McGovern | 2011-03-10 | 7 | -7/+7 |
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Thiago Macieira | 2011-03-11 | 1 | -5/+5 |
|\ \ | |/ |/| | |||||
| * | Bump Qt version to 4.7.3 | Timo Turunen | 2011-03-09 | 8 | -25/+25 |
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-10 | 28 | -2506/+1171 |
|\ \ | |/ | |||||
| * | Doc: Updated the copyright statements in the templates. | David Boddie | 2011-02-01 | 2 | -2/+2 |
| * | Doc: Added a missing style sheet to the qhp manifest. | David Boddie | 2011-01-28 | 1 | -1/+1 |
| * | Doc: Fixed the qthelp namespace for the Qt documentation. | David Boddie | 2011-01-28 | 1 | -1/+1 |
| * | Removed a configuration file that can no longer be used. | David Boddie | 2011-01-24 | 1 | -12/+0 |
| * | Doc: Updated the Qt version number. | David Boddie | 2010-12-21 | 1 | -4/+4 |
| * | Doc: Fixed whitespace. | David Boddie | 2010-12-21 | 3 | -11/+11 |
| * | Updated the offline template to use a new offline style sheet. | David Boddie | 2010-12-17 | 2 | -17/+10 |
| * | Whitespace fixes. | David Boddie | 2010-12-17 | 1 | -1/+1 |
| * | Removed macros for figures and floats. We'll use \div...\enddiv instead. | David Boddie | 2010-12-14 | 1 | -32/+0 |
| * | Merge branch 'qdoc-simplified' into mimir-simplified | David Boddie | 2010-12-14 | 5 | -53/+42 |
| |\ | |||||
| | * | Added macros for floating images and floating images with alt text. | David Boddie | 2010-12-13 | 1 | -0/+32 |
| | * | Removed redundant style information and images. | David Boddie | 2010-12-09 | 4 | -53/+10 |
| * | | qdoc: Changed index.qdoc to use new \div command | Martin Smith | 2010-12-14 | 2 | -0/+2 |
| * | | doc: Removed the \hr macro from the DITA XML qdocconf file. | Martin Smith | 2010-12-09 | 1 | -1/+1 |
| * | | Updated the DITA configuration to use the new configuration structure. | David Boddie | 2010-12-07 | 1 | -1/+1 |
| * | | Merge branch 'qdoc-simplified' into mimir-simplified | David Boddie | 2010-12-07 | 30 | -2461/+1189 |
| |\ \ | | |/ | |||||
| | * | Merge branch '4.7' into qdoc-simplified | David Boddie | 2010-11-30 | 7 | -20/+20 |
| | |\ | |||||
| | * | | Fixed grammar. | David Boddie | 2010-11-29 | 2 | -2/+2 |
| | * | | Added the version number to the configuration and fixed the generator. | David Boddie | 2010-11-24 | 1 | -1/+4 |
| | * | | Moved style-specific declarations. Removed script declarations. | David Boddie | 2010-11-18 | 4 | -43/+70 |
| | * | | Started fixing qdoc's output to use some kind of page templates. | David Boddie | 2010-11-11 | 17 | -1137/+1139 |
| | * | | Removed obsolete files. | David Boddie | 2010-11-10 | 6 | -1336/+0 |
| * | | | qdoc: Fixed some reported bugs in the XML. | Martin Smith | 2010-12-06 | 1 | -1/+7 |
| * | | | Merge branch '4.7' into mimir | Morten Engvoldsen | 2010-10-09 | 1 | -2/+3 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch '4.7' into mimir | Morten Engvoldsen | 2010-09-29 | 1 | -32/+8 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch '4.7' into mimir | Morten Engvoldsen | 2010-09-23 | 12 | -38/+38 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'mimir' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into mimir | Morten Engvoldsen | 2010-09-20 | 1 | -0/+31 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | qdoc: DITA XML generator now uses <section> elements... | Martin Smith | 2010-09-18 | 1 | -0/+31 |
* | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-01-17 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix for qtdemo bug | Jerome Pasion | 2011-01-10 | 1 | -3/+3 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge remote branch 'qt/master' | Jason McDonald | 2010-11-22 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-11-19 | 2 | -2/+11 |
| |\ \ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60 | axis | 2010-11-19 | 6 | -15/+23 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | / / / / / / / | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge remote branch 'qt/4.7' into 4.7 | Jason McDonald | 2010-11-18 | 2 | -3/+11 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | qdoc: Added QML Elements to the Assistant index | Martin Smith | 2010-11-11 | 2 | -3/+11 |
| | | |_|_|_|_|/ | | |/| | | | | | |||||
| * | | | | | | | Bump Qt version to 4.7.2. | Jason McDonald | 2010-11-12 | 11 | -36/+36 |
| |/ / / / / / | |||||
* | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-11-05 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Doc: Correcting character escape bug | Morten Engvoldsen | 2010-11-04 | 1 | -1/+1 |
* | | | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-11-04 | 1 | -1/+33 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Doc: updating the template to support search feature better. | Morten Engvoldsen | 2010-11-03 | 1 | -1/+33 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-10-25 | 1 | -2/+3 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Added Q_INVOKABLE to ignore file. | Jerome Pasion | 2010-10-08 | 1 | -2/+3 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-10-07 | 1 | -32/+8 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '4.7' into newSearch | Morten Engvoldsen | 2010-09-28 | 1 | -31/+0 |
| |\ \ \ \ | |||||
| | * | | | | Doc: fixing bugs in slim-fit style | Morten Engvoldsen | 2010-09-28 | 1 | -31/+0 |
| | | |_|/ | | |/| | |