From: acid-burn <acidburn@opendreambox.org>
Date: Wed, 11 Nov 2009 09:56:30 +0000 (+0100)
Subject: Merge branch 'bug_249_current_skin_fallback' into experimental
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=39f3d5a554528bcbdc79cc0f2bdd2d59c92b0a4e

Merge branch 'bug_249_current_skin_fallback' into experimental

Conflicts:
	lib/python/Components/FileList.py
	lib/python/Plugins/Extensions/MediaPlayer/plugin.py
---

39f3d5a554528bcbdc79cc0f2bdd2d59c92b0a4e
diff --cc lib/python/Components/FileList.py
index b187ee3,0d77553..222512e
--- a/lib/python/Components/FileList.py
+++ b/lib/python/Components/FileList.py
@@@ -3,7 -3,7 +3,7 @@@ from os import path as os_path, listdi
  from MenuList import MenuList
  from Components.Harddisk import harddiskmanager
  
- from Tools.Directories import SCOPE_SKIN_IMAGE, resolveFilename, fileExists
 -from Tools.Directories import SCOPE_CURRENT_SKIN, resolveFilename
++from Tools.Directories import SCOPE_CURRENT_SKIN, resolveFilename, fileExists
  
  from enigma import RT_HALIGN_LEFT, eListboxPythonMultiContent, \
  	eServiceReference, eServiceCenter, gFont
diff --cc lib/python/Plugins/Extensions/MediaPlayer/plugin.py
index c1badb2,a2422be..0fc78fb
mode 100644,100755..100755
--- a/lib/python/Plugins/Extensions/MediaPlayer/plugin.py
+++ b/lib/python/Plugins/Extensions/MediaPlayer/plugin.py