git.cweiske.de / enigma2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: ceda5c9 ca5b570)
Merge commit 'origin/bug_478_Listbox_ScrollbarMode'
authoracid-burn <acid-burn@opendreambox.org>
Tue, 5 Oct 2010 07:33:32 +0000 (09:33 +0200)
committeracid-burn <acid-burn@opendreambox.org>
Tue, 5 Oct 2010 07:33:32 +0000 (09:33 +0200)
Conflicts:
lib/python/Components/Converter/TemplatedMultiContent.py
lib/python/Components/Renderer/Listbox.py


Trivial merge
Clone of git://git.opendreambox.org/git/enigma2.git before dream multimedia removed all the engima2 sources