Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'origin/master' into bearermanagement/integration | Aaron McCarthy | 2010-02-11 | 16 | -197/+756 |
|\ | |||||
| * | Merge remote branch 'qt/4.6' into qt-master-from-4.6 | Qt Continuous Integration System | 2010-02-09 | 9 | -59/+218 |
| |\ | |||||
| * \ | Merge remote branch 'origin/4.6' into qt-master-from-4.6 | Olivier Goffart | 2010-02-04 | 8 | -14/+55 |
| |\ \ | |||||
| * \ \ | Merge remote branch 'origin/4.6' into qt-master-from-4.6 | Thiago Macieira | 2010-02-02 | 17 | -70/+363 |
| |\ \ \ | |||||
| * \ \ \ | Merge remote branch 'qt/4.6' into qt-master-from-4.6 | Qt Continuous Integration System | 2010-02-01 | 7 | -15/+54 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge commit 'oslo1/master' into oslo1-master | Rohan McGovern | 2010-02-01 | 2 | -2/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | build fix for phonon on wince | Thierry Bastian | 2010-01-25 | 2 | -2/+2 |
| | * | | | | | Merge branch '4.6' | Thiago Macieira | 2010-01-21 | 9 | -24/+70 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch '4.6' | Thiago Macieira | 2010-01-18 | 14 | -14/+52 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch '4.6' | Thiago Macieira | 2010-01-13 | 42 | -242/+1614 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch '4.6' | Thiago Macieira | 2010-01-12 | 29 | -501/+837 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch '4.6' | Thiago Macieira | 2010-01-08 | 7 | -9/+54 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch '4.6' | Thiago Macieira | 2010-01-05 | 14 | -24/+1618 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' | Thiago Macieira | 2009-12-26 | 11 | -29/+142 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' | Thiago Macieira | 2009-12-02 | 27 | -30/+331 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'origin/4.6' into oslo1-master | Rohan McGovern | 2010-02-01 | 98 | -779/+4648 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Merge branch '4.6' | Thiago Macieira | 2009-11-25 | 114 | -2084/+4426 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Sync with latest clucene source. Fixes at least two crash bugs. | kh1 | 2009-11-16 | 6 | -66/+111 |
| * | | | | | | | | | | | | | | | Phonon: cleanup for mingw 3.X ifdefs | Thierry Bastian | 2009-11-16 | 2 | -15/+0 |
| * | | | | | | | | | | | | | | | Phonon: make EVR also the default for mingw and fix build with wince | Thierry Bastian | 2009-11-16 | 8 | -384/+638 |
| * | | | | | | | | | | | | | | | Add EVR to the Phonon DirectShow9 (ds9) backend as the default. | APTX | 2009-11-16 | 3 | -4/+279 |
* | | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-02-10 | 3 | -1/+18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | Fix the WebKit build | Simon Hausmann | 2010-02-10 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ... | Simon Hausmann | 2010-02-10 | 3 | -1/+18 |
* | | | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr... | Qt Continuous Integration System | 2010-02-10 | 1 | -17/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | License update as requested by legal for file relicensed from S60. | Janne Anttila | 2010-02-10 | 1 | -17/+0 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ... | Simon Hausmann | 2010-02-10 | 3 | -3/+17 |
|/ / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-02-06 | 6 | -28/+81 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ... | Simon Hausmann | 2010-02-05 | 6 | -28/+81 |
* | | | | | | | | | | | | | | | | Merge remote branch 'origin/4.6' into 4.6 | Paul Olav Tvete | 2010-02-05 | 1 | -31/+22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-02-05 | 1 | -31/+22 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | I10n: Use 'real' Linguist comments in Phonon::EnvironmentalReverb | Friedemann Kleint | 2010-02-04 | 1 | -31/+22 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ... | Qt Continuous Integration System | 2010-02-05 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge remote branch 'staging/4.6' into 4.6 | Samuel Rødal | 2010-02-04 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ... | Qt Continuous Integration System | 2010-02-03 | 1 | -0/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ... | Qt Continuous Integration System | 2010-02-03 | 1 | -0/+3 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ... | Qt Continuous Integration System | 2010-02-02 | 1 | -0/+3 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ... | Qt Continuous Integration System | 2010-02-01 | 1 | -0/+3 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | * | | | | | | | | | | | | | fix crash in Phonon::DS9 backend | Joerg Bornemann | 2010-02-01 | 1 | -0/+3 |
| | | | | | | |_|_|_|_|_|_|_|_|_|_|/ | | | | | | |/| | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | Initial support for S60 softkey icons. | Janne Anttila | 2010-02-04 | 1 | -0/+112 |
|/ / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr... | Qt Continuous Integration System | 2010-02-03 | 2 | -2/+22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Added descriptions of translatable strings for Phonon MMF reverb effect | Gareth Stockwell | 2010-02-03 | 1 | -1/+21 |
| * | | | | | | | | | | | | | | | | Corrected namespace for Phonon::MMF translatable error strings | Gareth Stockwell | 2010-02-03 | 1 | -1/+1 |
| |/ / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-int... | Qt Continuous Integration System | 2010-02-03 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6 | ck | 2010-02-02 | 8 | -12/+181 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | Webkit: Fix missing namespace. | ck | 2010-02-02 | 1 | -0/+2 |
| | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ... | Simon Hausmann | 2010-02-02 | 4 | -11/+30 |
* | | | | | | | | | | | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ... | Simon Hausmann | 2010-02-02 | 2 | -2/+2 |
| |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ... | Simon Hausmann | 2010-02-01 | 8 | -12/+181 |
|/ / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ... | Simon Hausmann | 2010-01-29 | 13 | -59/+183 |
|/ / / / / / / / / / / / |