summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Alexis Menard2009-05-121-0/+5
|\
| * Merge branch '4.5'Thiago Macieira2009-05-111-0/+5
| |\
| | * Make sure syncqt creates the Phonon/Global file.Thiago Macieira2009-05-111-0/+5
| * | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-05-063-0/+747
| |\ \ | | |/
* | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic in...Michael Brasser2009-05-071-3/+3
|\ \ \
| * | | remove multiplication by 1 in easing curvesThierry Bastian2009-04-291-3/+3
* | | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-05-063-0/+747
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix line encoding on PowerVR headersTom Cooksey2009-05-052-742/+742
| * | | Add headers required for building PowerVR driverTom Cooksey2009-05-053-0/+747
* | | | qdoc: Corrected some qdoc warnings.Martin Smith2009-05-041-1/+1
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-04-2830-53/+1047
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-04-253-2/+10
| |\ \ \ | | |/ /
| | * | Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ...Simon Hausmann2009-04-243-2/+10
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-2430-52/+1038
| |\ \ \ | | |/ /
| | * | Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ...Simon Hausmann2009-04-2414-11/+601
| | * | Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ...Simon Hausmann2009-04-2419-42/+438
* | | | Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic in...Michael Brasser2009-04-231-48/+48
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix a bug in the ease{In,Out}Bounce easing functions + small cleanup.Jan-Arve Sæther2009-04-231-17/+17
| * | | Remove trailing whitespaceJan-Arve Sæther2009-04-231-32/+32
| * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-animationsAlexis Menard2009-04-1730-120/+633
| |\ \ \
| * | | | Initial import of kinetic-animations branch from the old kineticAlexis Menard2009-04-175987-0/+2085142
| / / /
* | | | Merge branch 'master' of ../../qt/qt into kinetic-declarativeuiMichael Brasser2009-04-221-18/+9
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch '4.5'Rhys Weatherley2009-04-211-18/+9
| |\ \ \ | | | |/ | | |/|
| | * | Fixed a flicker when switching current source in Phonon::MediaObjectThierry Bastian2009-04-211-18/+9
| | |/
* | | Initial import of kinetic-dui branch from the old kineticMichael Brasser2009-04-222-0/+704
|/ /
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-175-4/+24
|\ \ | |/
| * Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ...Simon Hausmann2009-04-175-4/+24
| * Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ...Simon Hausmann2009-04-1513-700/+1794
* | Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ...Simon Hausmann2009-04-1513-700/+1794
* | Merge commit 'origin/4.5'Bjoern Erik Nilsen2009-04-0712-1657/+744
|\ \ | |/
| * Update WebKit from code.staikos.net/srv/git/webkitTor Arne Vestbø2009-04-0612-1657/+744
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-025-5/+35
|\ \ | |/
| * Doc - fixing a broken link in the documentation of QWebPageKavindra Devi Palaraja2009-04-021-1/+1
| * Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ...Simon Hausmann2009-04-025-4/+34
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-013-7/+11
|\ \ | |/
| * Get the qt7 phonon plugin to minimally compile on 10.6Norwegian Rock Cat2009-03-313-7/+11
* | Merge branch '4.5'Thiago Macieira2009-03-275-8/+67
|\ \ | |/
| * Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ...Simon Hausmann2009-03-275-8/+67
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-03-266-3/+54
|\ \ | |/
| * Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ...Simon Hausmann2009-03-266-3/+54
* | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-03-234-50/+51
|\ \ | |/
| * Updated WebKit from /home/shausman/src/webkit/trunk to origin/qtwebkit-4.5 ( ...Simon Hausmann2009-03-234-50/+51
| * Long live Qt 4.5!Lars Knoll2009-03-235985-0/+2084605
* Long live Qt!Lars Knoll2009-03-235985-0/+2084807