Frederik Gladhorn f9014d136f Merge remote-tracking branch 'origin/5.4' into dev ...

Change-Id: I5575a4ba13212c9bfe73a3de3ef17c6528beafc3

2015-02-13 13:10:48 +01:00

..

playback.pri

Tweak the controls documentation.

2012-06-15 08:49:26 +02:00

playlistfileparser_p.h

Update copyright headers

2015-02-12 10:27:47 +00:00

playlistfileparser.cpp

Update copyright headers

2015-02-12 10:27:47 +00:00

qmediacontent.cpp

Update copyright headers

2015-02-12 10:27:47 +00:00

qmediacontent.h

Update copyright headers

2015-02-12 10:27:47 +00:00

qmedianetworkplaylistprovider_p.h

Update copyright headers

2015-02-12 10:27:47 +00:00

qmedianetworkplaylistprovider.cpp

Update copyright headers

2015-02-12 10:27:47 +00:00

qmediaplayer.cpp

Merge remote-tracking branch 'origin/5.4' into dev

2015-02-13 13:10:48 +01:00

qmediaplayer.h

Update copyright headers

2015-02-12 10:27:47 +00:00

qmediaplaylist_p.h

Update copyright headers

2015-02-12 10:27:47 +00:00

qmediaplaylist.cpp

Update copyright headers

2015-02-12 10:27:47 +00:00

qmediaplaylist.h

Update copyright headers

2015-02-12 10:27:47 +00:00

qmediaplaylistioplugin_p.h

Update copyright headers

2015-02-12 10:27:47 +00:00

qmediaplaylistioplugin.cpp

Update copyright headers

2015-02-12 10:27:47 +00:00

qmediaplaylistnavigator_p.h

Update copyright headers

2015-02-12 10:27:47 +00:00

qmediaplaylistnavigator.cpp

Update copyright headers

2015-02-12 10:27:47 +00:00

qmediaplaylistprovider_p.h

Update copyright headers

2015-02-12 10:27:47 +00:00

qmediaplaylistprovider.cpp

Update copyright headers

2015-02-12 10:27:47 +00:00

qmediaresource.cpp

Update copyright headers

2015-02-12 10:27:47 +00:00

qmediaresource.h

Update copyright headers

2015-02-12 10:27:47 +00:00