Merge branch 'master' into tmbinc/FixTimingBugs
authorFelix Domke <tmbinc@elitedvb.net>
Mon, 17 Nov 2008 14:42:54 +0000 (15:42 +0100)
committerFelix Domke <tmbinc@elitedvb.net>
Mon, 17 Nov 2008 14:42:54 +0000 (15:42 +0100)
commita34ef895210161a8820e96829ac87806566e7858
tree55b9f104dbbdd8a1d72e598b989421f839576b9a
parent588010098dbcc24b82ea736feec6b6056cffd2e3
parent153e0ed5048c79c600e1acd085b62015b7314ba7
Merge branch 'master' into tmbinc/FixTimingBugs

Conflicts:

lib/dvb/sec.cpp
lib/python/Components/Network.py
lib/python/Components/Playlist.py
lib/python/Plugins/Extensions/DVDBurn/Process.py
lib/python/Plugins/Extensions/MediaPlayer/plugin.py
lib/python/Screens/TimerEdit.py
po/lt.po
po/nl.po
po/tr.po
lib/dvb/dvb.cpp
lib/dvb/pvrparse.cpp
lib/python/Components/Network.py
lib/service/servicedvb.cpp