summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-02-022-2/+2
| | |/ / | |/| |
* | | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-0217-70/+363
|\| | |
| * | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-02-018-12/+181
| |/ /
| * / Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-01-2913-59/+183
| |/
* | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-017-15/+54
|\|
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-01-281-0/+5
| |\
| | * Fixed an endless loop if printing web pages.Trond Kjernåsen2010-01-281-0/+5
| * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-01-252-3/+5
| * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-01-256-13/+45
| |/
* | Merge commit 'oslo1/master' into oslo1-masterRohan McGovern2010-02-012-2/+2
|\ \
| * | build fix for phonon on winceThierry Bastian2010-01-252-2/+2
| * | Merge branch '4.6'Thiago Macieira2010-01-219-24/+70
| |\ \
| * \ \ Merge branch '4.6'Thiago Macieira2010-01-1814-14/+52
| |\ \ \
| * \ \ \ Merge branch '4.6'Thiago Macieira2010-01-1342-242/+1614
| |\ \ \ \
| * \ \ \ \ Merge branch '4.6'Thiago Macieira2010-01-1229-501/+837
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.6'Thiago Macieira2010-01-087-9/+54
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2010-01-0514-24/+1618
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-12-2611-29/+142
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-12-0227-30/+331
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge commit 'origin/4.6' into oslo1-masterRohan McGovern2010-02-0198-779/+4648
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | / | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 02:30:03 +0000