aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Components
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2009-02-11 15:21:36 +0100
committerghost <andreas.monzner@multimedia-labs.de>2009-02-11 15:21:36 +0100
commit99f33df4a530c7aa6de98f6e7a64c6d2c626c756 (patch)
tree6c307a3899e4b4ad79b02613246a6145c29687bb /lib/python/Components
parent6d7d1767d32a95d94c817129be77147885e850fa (diff)
parent5e6f814d005a01caa437a532e61f4b338617ff67 (diff)
downloadenigma2-99f33df4a530c7aa6de98f6e7a64c6d2c626c756.tar.gz
enigma2-99f33df4a530c7aa6de98f6e7a64c6d2c626c756.zip
Merge branch 'master' of git.opendreambox.org:/git/enigma2
Diffstat (limited to 'lib/python/Components')
-rw-r--r--lib/python/Components/Converter/TemplatedMultiContent.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/python/Components/Converter/TemplatedMultiContent.py b/lib/python/Components/Converter/TemplatedMultiContent.py
index cc00455c..5f1d4f24 100644
--- a/lib/python/Components/Converter/TemplatedMultiContent.py
+++ b/lib/python/Components/Converter/TemplatedMultiContent.py
@@ -5,7 +5,7 @@ class TemplatedMultiContent(StringList):
def __init__(self, args):
StringList.__init__(self, args)
from enigma import eListboxPythonMultiContent, gFont, RT_HALIGN_LEFT, RT_HALIGN_CENTER, RT_HALIGN_RIGHT, RT_VALIGN_TOP, RT_VALIGN_CENTER, RT_VALIGN_BOTTOM
- from Components.MultiContent import MultiContentEntryText, MultiContentEntryPixmap, MultiContentEntryPixmapAlphaTest
+ from Components.MultiContent import MultiContentEntryText, MultiContentEntryPixmap, MultiContentEntryPixmapAlphaTest, MultiContentTemplateColor
l = locals()
del l["self"] # cleanup locals a bit
del l["args"]