Frederik Gladhorn c5706f05a8 Merge remote-tracking branch 'origin/stable' into dev ...

Conflicts:
	.qmake.conf

Change-Id: I6ea9c40c69f55fa733fd9000a57d570fff21f1e9

2013-11-29 16:03:52 +01:00

..

camera

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

2013-11-20 16:43:45 +01:00

common

QNX: Restructure plugins

2013-11-09 12:23:53 +01:00

mediaplayer

BlackBerry: Fix metadata key for "artist"

2013-11-28 19:37:32 +01:00

bbserviceplugin.cpp

Fix BB10 build

2013-11-10 18:23:49 +01:00

bbserviceplugin.h

QNX: Restructure plugins

2013-11-09 12:23:53 +01:00

blackberry_mediaservice.json

QNX: Restructure plugins

2013-11-09 12:23:53 +01:00

neutrino_mediaservice.json

QNX: Restructure plugins

2013-11-09 12:23:53 +01:00

neutrinoserviceplugin.cpp

QNX: Restructure plugins

2013-11-09 12:23:53 +01:00

neutrinoserviceplugin.h

QNX: Restructure plugins

2013-11-09 12:23:53 +01:00

qnx.pro

QNX: Restructure plugins

2013-11-09 12:23:53 +01:00