diff options
| author | acid-burn <acid-burn@opendreambox.org> | 2010-01-19 08:35:27 +0100 |
|---|---|---|
| committer | acid-burn <acid-burn@opendreambox.org> | 2010-01-19 08:35:27 +0100 |
| commit | ef25d742a5eda3b2b679d39c38cb1ce4c8daa5d4 (patch) | |
| tree | a3823cf006a0e07474a254fa6ad140a705974f4d /lib/python/Components/ServiceList.py | |
| parent | 547ecaf9bfda061aca736aefb04ca0743a6395cc (diff) | |
| parent | bb2987585250d140bc125d8e316f2381421447e4 (diff) | |
| download | enigma2-ef25d742a5eda3b2b679d39c38cb1ce4c8daa5d4.tar.gz enigma2-ef25d742a5eda3b2b679d39c38cb1ce4c8daa5d4.zip | |
Merge commit 'origin/bug_383_softwaremanager' into experimental
Conflicts:
lib/python/Plugins/Extensions/MediaPlayer/plugin.py
Diffstat (limited to 'lib/python/Components/ServiceList.py')
0 files changed, 0 insertions, 0 deletions