summaryrefslogtreecommitdiffstats
path: root/demos/mediaplayer
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'qt/master'Jason Barron2009-08-133-5/+5
|\
| * Replace some mentions of Trolltech with more appropriate terms.Jason McDonald2009-08-121-2/+2
| * Update contact URL in license headers.Jason McDonald2009-08-123-3/+3
* | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-303-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-237-0/+1533
* Added proper UID3 for some demos and examples.Miikka Heikkinen2009-06-101-0/+2
* Long live Qt for S60!axis2009-04-247-0/+1533