diff options
| author | acid-burn <acid-burn@opendreambox.org> | 2010-10-05 13:00:54 +0200 |
|---|---|---|
| committer | acid-burn <acid-burn@opendreambox.org> | 2010-10-05 13:00:54 +0200 |
| commit | be8ccc9f63c4cd79f8dba84087c7348c23657865 (patch) | |
| tree | e45dcc397e7ef5e39a64fbd19d74268ab3650a40 /lib/python/Components/Task.py | |
| parent | ef8469a63bbe601f4e1ac0bb68226e25070a1ce4 (diff) | |
| parent | 3b990b579c3f4211994b91ea60f3d9f868ac065a (diff) | |
| download | enigma2-be8ccc9f63c4cd79f8dba84087c7348c23657865.tar.gz enigma2-be8ccc9f63c4cd79f8dba84087c7348c23657865.zip | |
Merge commit 'origin/bug_578_translateable_meta_descriptions'
Conflicts:
lib/python/Plugins/Extensions/GraphMultiEPG/meta/plugin_graphmultiepg.xml
Diffstat (limited to 'lib/python/Components/Task.py')
0 files changed, 0 insertions, 0 deletions