Merge remote-tracking branch 'remotes/origin/master' into webif_js_rewrite
[enigma2-plugins.git] / merlinmusicplayer / meta /
drwxr-xr-x   ..
-rw-r--r-- 116 Makefile.am
-rw-r--r-- 58246 merlinmusicplayer.jpg
-rw-r--r-- 807 plugin_merlinmusicplayer.xml