summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git:qt/qtThiago Macieira2010-02-21299-68175/+34128
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-20299-68175/+34128
| |\
| | * Merge branch 'rtiff392'aavit2010-02-20169-62667/+9295
| | |\
| | | * Our configuration and build modifications to libtiffaavit2010-02-166-1/+454
| | | * Add libtiff 3.9.2aavit2010-02-16209-0/+68942
| | | * Delete libtiff 3.8.2aavit2010-02-11243-122767/+0
| | * | Our configuration and build modifications to libjpegaavit2010-02-162-2/+53
| | * | Add libjpeg 8aavit2010-02-16137-0/+53170
| | * | Delete libjpeg 6baavit2010-02-1690-33896/+0
* | | | WinCE doesn't have sys/types.hThiago Macieira2010-02-201-1/+1
* | | | Merge remote branch 'origin/master'Thiago Macieira2010-02-20130-10073/+43669
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-192-7/+7
| |\ \ \
| | * | | optimization: get rid of QString::fromUtf16() usage, part 2Oswald Buddenhagen2010-02-162-7/+7
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra...Qt Continuous Integration System2010-02-191-0/+4
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | MOBILITY-404 QS Windows.Wolfgang Beck2010-02-161-0/+4
| | |/ /
| * | | Merge remote branch 'qt/master' into staging-2-masterQt Continuous Integration System2010-02-157-23/+35
| |\ \ \ | | |/ /
| * | | Our modifications to libpngaavit2010-02-151-2/+12
| * | | Add libpng 1.4.0aavit2010-02-15124-0/+85998
| * | | Delete libpng 1.2.40aavit2010-02-15121-52416/+0
| | |/ | |/|
* | | Doc: Simplified Commercial Editions for Qt 4.7.David Boddie2010-02-191-3/+0
| |/ |/|
* | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-127-23/+35
|\ \ | |/ |/|
| * Revert WebCore.pro part of 2761e6f57ecd00c3435dbb8a6cf5f40653195d5d to build ...Simon Hausmann2010-02-111-3/+1
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-103-1/+18
| |\
| | * Fix the WebKit buildSimon Hausmann2010-02-101-1/+1
| | * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-02-103-1/+18
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-101-17/+0
| |\ \ | | |/ | |/|
| | * License update as requested by legal for file relicensed from S60.Janne Anttila2010-02-101-17/+0
| * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-02-103-3/+17
| |/
* | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-099-59/+218
|\ \ | |/
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-066-28/+81
| |\
| | * Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-02-056-28/+81
| * | Merge remote branch 'origin/4.6' into 4.6Paul Olav Tvete2010-02-051-31/+22
| |\ \ | | |/
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-02-051-31/+22
| | |\
| | | * I10n: Use 'real' Linguist comments in Phonon::EnvironmentalReverbFriedemann Kleint2010-02-041-31/+22
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-051-0/+3
| |\ \ \ | | |/ / | |/| |
| | * | Merge remote branch 'staging/4.6' into 4.6Samuel Rødal2010-02-041-0/+3
| | |\ \ | | | |/ | | |/|
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-031-0/+3
| | | |\
| | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-031-0/+3
| | | | |\
| | | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-021-0/+3
| | | | | |\
| | | | | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-02-011-0/+3
| | | | | | |\
| | | | | | | * fix crash in Phonon::DS9 backendJoerg Bornemann2010-02-011-0/+3
| * | | | | | | Initial support for S60 softkey icons.Janne Anttila2010-02-041-0/+112
| |/ / / / / /
* | | | | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-048-14/+55
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-02-032-2/+22
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Added descriptions of translatable strings for Phonon MMF reverb effectGareth Stockwell2010-02-031-1/+21
| | * | | | | Corrected namespace for Phonon::MMF translatable error stringsGareth Stockwell2010-02-031-1/+1
| | |/ / / /
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int...Qt Continuous Integration System2010-02-031-0/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6ck2010-02-028-12/+181
| | |\ \ \ \ | | | |/ / /
| | * | | | Webkit: Fix missing namespace.ck2010-02-021-0/+2
| | | |/ / | | |/| |
| * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-02-024-11/+30