From: acid-burn <acid-burn@opendreambox.org>
Date: Mon, 28 Dec 2009 21:18:40 +0000 (+0100)
Subject: Merge commit 'origin/bug_112_enable_extensions_manager' into experimental
X-Git-Tag: 3.0.0~28^2~66^2~127
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/a7ed9db9532b7ac58dc3b923c0e3f9ee1789ddeb

Merge commit 'origin/bug_112_enable_extensions_manager' into experimental

Conflicts:
	lib/python/Plugins/SystemPlugins/NetworkWizard/NetworkWizard.py
---

a7ed9db9532b7ac58dc3b923c0e3f9ee1789ddeb
diff --cc lib/python/Screens/TimerEntry.py
index 42a3195c,b231b568..d7ba73d7
--- a/lib/python/Screens/TimerEntry.py
+++ b/lib/python/Screens/TimerEntry.py
@@@ -8,8 -8,8 +8,9 @@@ from Components.MenuList import MenuLis
  from Components.Button import Button
  from Components.Label import Label
  from Components.Pixmap import Pixmap
+ from Components.SystemInfo import SystemInfo
  from Components.UsageConfig import defaultMoviePath
 +from Components.SystemInfo import SystemInfo
  from Screens.MovieSelection import getPreferredTagEditor
  from Screens.LocationBox import MovieLocationBox
  from Screens.ChoiceBox import ChoiceBox