projects / vuplus_dvbapp / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: fd6a97a ca5b570)
Merge commit 'origin/bug_478_Listbox_ScrollbarMode' into experimental
authoracid-burn <acid-burn@opendreambox.org>
Thu, 18 Mar 2010 10:24:53 +0000 (11:24 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Thu, 18 Mar 2010 10:24:53 +0000 (11:24 +0100)
Conflicts:
lib/python/Components/Converter/TemplatedMultiContent.py
lib/python/Components/Renderer/Listbox.py


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.