diff options
| author | acid-burn <acid-burn@opendreambox.org> | 2010-03-18 11:24:53 +0100 |
|---|---|---|
| committer | acid-burn <acid-burn@opendreambox.org> | 2010-03-18 11:24:53 +0100 |
| commit | aa979f0bc35f6160453b966942a0a86602d8c071 (patch) | |
| tree | d359865d20fd81c907a9b7b7f46f58976faba1f9 /lib/python/Components/Clock.py | |
| parent | fd6a97a1e97091b733add33b46ba746a467b21fa (diff) | |
| parent | ca5b57073d8ef83110e6956b71134f3c1a1589a6 (diff) | |
| download | enigma2-aa979f0bc35f6160453b966942a0a86602d8c071.tar.gz enigma2-aa979f0bc35f6160453b966942a0a86602d8c071.zip | |
Merge commit 'origin/bug_478_Listbox_ScrollbarMode' into experimental
Conflicts:
lib/python/Components/Converter/TemplatedMultiContent.py
lib/python/Components/Renderer/Listbox.py
Diffstat (limited to 'lib/python/Components/Clock.py')
0 files changed, 0 insertions, 0 deletions