summaryrefslogtreecommitdiffstats
path: root/examples/phonon/musicplayer
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'origin/master' into 4.6-mergedJason Barron2009-07-091-1/+1
|\
| * Merge branch 'warningRemovals'axis2009-06-301-1/+1
| |\
| | * Removed warnings because of extra semicolons.axis2009-06-301-1/+1
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-293-6/+6
| |\ \ | | |/ | |/|
* | | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-303-6/+6
|\ \ \
| * \ \ Merge license header changes from 4.5Volker Hilsheimer2009-06-163-6/+6
| |\ \ \ | | | |/ | | |/|
| | * | Update license headers as requested by the marketing department.Jason McDonald2009-06-163-6/+6
| | * | Long live Qt 4.5!Lars Knoll2009-03-234-0/+537
| | /
* | | Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-251-1/+1
|\ \ \ | |/ / | | / | |/ |/|
| * Replace all instances of "Ctrl+Q" with QKeySequence::Quit.Norwegian Rock Cat2009-05-121-1/+1
| * Long live Qt!Lars Knoll2009-03-234-0/+537
* Added proper UID3 for some demos and examples.Miikka Heikkinen2009-06-101-0/+1
* Long live Qt for S60!axis2009-04-244-0/+537