From: ghost <andreas.monzner@multimedia-labs.de>
Date: Wed, 9 Feb 2011 14:10:03 +0000 (+0100)
Subject: Merge branch 'bug_570_playback_skip_fixes_and_cleanup_ml_aholst'
X-Git-Tag: experimental-2011.03~6^2~11
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/7211bd40026fb8b00be038a59abcbfa29569b3ed

Merge branch 'bug_570_playback_skip_fixes_and_cleanup_ml_aholst'
---

7211bd40026fb8b00be038a59abcbfa29569b3ed
diff --cc data/setup.xml
index f5dea734,fa8ff3f9..c5eb07f5
mode 100755,100644..100755
--- a/data/setup.xml
+++ b/data/setup.xml