Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-02-12 | 5 | -8/+166 |
|\ | |||||
| * | Doc/qdoc: Use Chinese titles; canonicalize titles with non-ASCII chars. | David Boddie | 2010-02-08 | 1 | -3/+2 |
| * | Doc/qdoc: Converted encoding of ISO-8859-1 docs to UTF-8. Output UTF-8. | David Boddie | 2010-02-08 | 2 | -4/+14 |
| * | Doc: Updated the configuration file for the Simplified Chinese docs. | David Boddie | 2010-02-08 | 1 | -11/+9 |
| * | qdoc: Standardized encoding names and updated the Chinese config files. | David Boddie | 2010-02-05 | 3 | -0/+150 |
| * | Doc: Synchronize configuration files for easier maintenance. | David Boddie | 2010-02-02 | 2 | -4/+5 |
* | | Merge branch 'kinetic-declarativeui' of git://git-nokia.trolltech.com.au/qtso... | Warwick Allison | 2010-02-04 | 3 | -4/+86 |
|\ \ | |/ |/| | |||||
| * | Merge branch '4.6' of ../qt into kinetic-declarativeui | Aaron Kennedy | 2010-01-20 | 6 | -10/+10 |
| |\ | |||||
| | * | Bump version to 4.6.2. | Jason McDonald | 2010-01-19 | 6 | -10/+10 |
| * | | Merge branch '4.6' of ../qt into kinetic-declarativeui | Aaron Kennedy | 2010-01-19 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| * | | Doc fixes. | Michael Brasser | 2010-01-15 | 2 | -3/+3 |
| * | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2010-01-14 | 4 | -4/+4 |
| |\ \ | |||||
| * \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Michael Brasser | 2009-12-07 | 6 | -10/+12 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2009-11-27 | 1 | -16/+0 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declara... | Warwick Allison | 2009-11-09 | 1 | -2/+2 |
| |\ \ \ \ \ | |||||
| * | | | | | | qdoc3: display 'read-only' in QML docs for read only properties. | Michael Brasser | 2009-10-30 | 1 | -1/+6 |
| * | | | | | | Merge branch '4.6' of ../qt into kinetic-declarativeui | Aaron Kennedy | 2009-10-29 | 1 | -150/+0 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-10-25 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-10-19 | 3 | -35/+0 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Improve qdoc generated QML documentation. | Michael Brasser | 2009-10-09 | 1 | -1/+4 |
| * | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-10-04 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge commit 'qt-mainline/4.6' into kinetic-declarativeui | Andreas Aardal Hanssen | 2009-10-02 | 10 | -22/+22 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-09-29 | 4 | -0/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'origin/4.6' into kinetic-declarativeui | Lars Knoll | 2009-09-18 | 3 | -4/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'qt/4.6' into kinetic-declarativeui | Bjørn Erik Nilsen | 2009-09-01 | 1 | -1/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati... | Michael Brasser | 2009-08-25 | 1 | -6/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Various doc fixes. | Michael Brasser | 2009-08-19 | 1 | -29/+10 |
| * | | | | | | | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar... | Michael Brasser | 2009-08-19 | 2 | -27/+42 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar... | Michael Brasser | 2009-08-13 | 12 | -25/+37 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar... | Aaron Kennedy | 2009-07-23 | 9 | -16/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar... | Michael Brasser | 2009-07-10 | 2 | -2/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar... | Michael Brasser | 2009-06-24 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar... | Michael Brasser | 2009-06-22 | 2 | -2/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar... | Aaron Kennedy | 2009-06-19 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar... | Michael Brasser | 2009-06-11 | 1 | -36/+40 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'qt/master' into kinetic-declarativeui | Bjørn Erik Nilsen | 2009-06-10 | 1 | -6/+43 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar... | Michael Brasser | 2009-06-09 | 1 | -3/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'mainline/master' into kinetic-declarativeui | Bjørn Erik Nilsen | 2009-06-04 | 1 | -10/+10 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar... | Michael Brasser | 2009-05-27 | 1 | -7/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar... | Michael Brasser | 2009-05-22 | 1 | -13/+63 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | qdoc: Fixed some qdoc errors. | Martin Smith | 2009-05-12 | 2 | -2/+4 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve QML documentation viewing in Assistant. | Michael Brasser | 2009-05-05 | 1 | -0/+77 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic... | Martin Smith | 2009-04-30 | 1 | -21/+28 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation work. | Michael Brasser | 2009-04-30 | 1 | -21/+28 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qdoc: Corrected some qdoc warnings. | Martin Smith | 2009-04-30 | 1 | -1/+2 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | qdoc: Corrected some qdoc warnings. | Martin Smith | 2009-04-29 | 1 | -1/+2 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar... | Michael Brasser | 2009-04-28 | 12 | -28/+30 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the documentation build. | Alexis Menard | 2009-04-23 | 2 | -2/+0 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of ../../qt/qt into kinetic-declarativeui | Michael Brasser | 2009-04-22 | 6 | -9/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial import of kinetic-dui branch from the old kinetic | Michael Brasser | 2009-04-22 | 3 | -2/+46 |