slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Change-Id: Ie93615076177662e75d46f3d13beeb88d424b4a6
This commit is contained in:
Frederik Gladhorn
2014-02-12 14:11:35 +01:00
parent 7a02bcaad1 db7f7cc565
commit c6ec402d25
19 changed files with 908 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/plugins.pro
View File

@@ -6,7 +6,7 @@
TEMPLATE = subdirs
SUBDIRS += m3u
SUBDIRS += m3u videonode
android {
SUBDIRS += android opensles