Merge commit 'dream/master'
authorMike Looijmans <milo-software@users.sourceforge.net>
Sat, 3 Apr 2010 10:15:36 +0000 (12:15 +0200)
committerMike Looijmans <milo-software@users.sourceforge.net>
Sat, 3 Apr 2010 10:15:36 +0000 (12:15 +0200)
commit8db609a574001b8b36c204e7ac14cb8616f2a92b
treed01eae5fc4f191ea443de20c3b9ae121b830151e
parentf91b276b0bbbfe50e0b2b7108aeb2435748c1082
parent5807686a79350632f38e4161c942ae59cf2f63ce
Merge commit 'dream/master'

Conflicts:

data/encoding.conf
lib/python/Components/Harddisk.py
lib/python/Components/TimerList.py
lib/python/Screens/ScanSetup.py
po/lt.po (kept ours)
po/nl.po (kept ours)
20 files changed:
Navigation.py
configure.ac
data/encoding.conf
data/skin_default.xml
lib/dvb/frontend.cpp
lib/dvb/frontend.h
lib/dvb/idvb.h
lib/python/Components/Harddisk.py
lib/python/Components/NimManager.py
lib/python/Components/Renderer/Listbox.py
lib/python/Components/TimerList.py
lib/python/Plugins/Extensions/DVDBurn/TitleList.py
lib/python/Screens/InfoBarGenerics.py
lib/python/Screens/Satconfig.py
lib/python/Screens/ScanSetup.py
lib/service/iservice.h
lib/service/servicedvb.cpp
lib/service/servicedvb.h
lib/service/servicemp3.cpp
po/Makefile.am