summaryrefslogtreecommitdiffstats
path: root/tools/linguist
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'qt-mainline/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-09-151-1/+0
|\
| * When parsing a java file do not simply ignore the first character.Jan-Arve Sæther2009-09-151-1/+0
* | Merge commit 'qt-mainline/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-09-1584-336/+336
|\ \ | |/
| * Update license headers again.Jason McDonald2009-09-0984-336/+336
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Martin Jones2009-09-081-2/+2
|\ \ | |/
| * Merge branch '4.5' into 4.6Thiago Macieira2009-09-041-2/+2
| |\
| | * Pedantic fixes for license headers.Jason McDonald2009-09-041-2/+2
* | | Merge commit 'qt/4.6' into kinetic-declarativeuiBjørn Erik Nilsen2009-09-033-286/+1
|\ \ \ | |/ /
| * | compile since broken merge from 4.5Gunnar Sletta2009-09-031-1/+1
| * | Merge branch '4.5' into 4.6Thiago Macieira2009-09-033-286/+1
| |\ \ | | |/
| | * Add missing license headersJason McDonald2009-09-031-0/+40
| | * Update license headers.Jason McDonald2009-09-022-6/+1
| | * Remove obsolete copies of GPL.Jason McDonald2009-09-021-280/+0
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-08-3184-1096/+1096
|\ \ \ | |/ /
| * | Update tech preview license header for files that are new in 4.6.Jason McDonald2009-08-313-39/+39
| * | Merge branch '4.5' into 4.6Thiago Macieira2009-08-3181-1057/+1057
| |\ \ | | |/
| | * Update tech preview license header.Jason McDonald2009-08-3182-1070/+1070
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-08-315-4/+45
|\ \ \ | |/ /
| * | Merge branch '4.5' into 4.6Thiago Macieira2009-08-284-4/+4
| |\ \ | | |/
| | * Add missing license headers.Jason McDonald2009-08-285-16/+198
| * | Fix some missing and duplicated license headers.Jason McDonald2009-08-271-0/+41
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-08-251-2/+1
|\ \ \ | |/ /
| * | Merge branch '4.5' into 4.6Thiago Macieira2009-08-241-2/+1
| |\ \ | | |/
| | * remove withdrawn attributes (and fix syntax)Oswald Buddenhagen2009-08-141-9/+0
| | * Update URL of online documentation.Jason McDonald2009-08-112-2/+2
| | * Qt's domain name is now qt.nokia.com.Jason McDonald2009-08-111-1/+1
| | * Update license headers.Jason McDonald2009-08-1177-77/+77
| | * remove useles QT += networkOswald Buddenhagen2009-08-071-2/+1
| | * Fix compilation with xlC 7: operands to ?: must match.Thiago Macieira2009-08-071-2/+2
| | * Fix compilation with xlC 7: operands to ?: must match.Thiago Macieira2009-08-071-1/+1
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Martin Jones2009-08-204-16/+157
|\ \ \ | |/ /
| * | Make the license test pass.Frans Englich2009-08-194-16/+157
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-08-191-91/+149
|\ \ \ | |/ /
| * | optimize getToken(), part 2: avoid QString::append()Oswald Buddenhagen2009-08-171-24/+66
| * | consolidate some variablesOswald Buddenhagen2009-08-171-70/+66
| * | optimize getToken(), part 1Oswald Buddenhagen2009-08-171-29/+47
| * | optimize getChar()Oswald Buddenhagen2009-08-171-7/+9
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Martin Jones2009-08-171-2/+4
|\ \ \ | |/ /
| * | qmake's include function now supports three argumentsKeith Isdale2009-08-141-2/+4
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-08-1381-99/+108
|\ \ \ | |/ /
| * | Replace "Trolltech" with more appropriate terms.Jason McDonald2009-08-121-1/+1
| * | Update references to online documentation.Jason McDonald2009-08-122-2/+2
| * | Update URL's to use new domain.Jason McDonald2009-08-121-1/+1
| * | Update contact URL in license headers.Jason McDonald2009-08-1279-79/+79
| * | Linguist: Fixed spehling error.Friedemann Kleint2009-08-104-10/+10
| * | nicer way to deal with missing support for template class friendsOswald Buddenhagen2009-08-062-4/+13
| * | Fix compilation with xlC 7: operands to ?: must match.Thiago Macieira2009-07-311-2/+2
* | | Merge branch 'master' of ../../qt into kinetic-declarativeuiAaron Kennedy2009-07-312-2/+4
|\ \ \ | |/ /
| * | fix infinite loop when meeting improper trId()Oswald Buddenhagen2009-07-301-1/+3
| * | Fix compilation with xlC 7: operands to ?: must match.Thiago Macieira2009-07-301-1/+1