From: ghost <andreas.monzner@multimedia-labs.de>
Date: Tue, 22 Dec 2009 15:08:21 +0000 (+0100)
Subject: Merge branch 'bug_236_recordpath'
X-Git-Tag: 2.7.0~32^2~14
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/4e8904ef73e3ce5e275a1f5fbf369c4f9dab648e

Merge branch 'bug_236_recordpath'
---

4e8904ef73e3ce5e275a1f5fbf369c4f9dab648e
diff --cc lib/python/Screens/TimerEntry.py
index c6b0db8f,5813bac5..b231b568
--- a/lib/python/Screens/TimerEntry.py
+++ b/lib/python/Screens/TimerEntry.py
@@@ -8,7 -8,7 +8,8 @@@ 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 Screens.MovieSelection import getPreferredTagEditor
  from Screens.LocationBox import MovieLocationBox
  from Screens.ChoiceBox import ChoiceBox