Mega-Merge remote branch 'dream/master' into mm
authorMike Looijmans <milo-software@users.sourceforge.net>
Thu, 30 Dec 2010 12:01:11 +0000 (13:01 +0100)
committerMike Looijmans <milo-software@users.sourceforge.net>
Thu, 30 Dec 2010 12:01:11 +0000 (13:01 +0100)
commitb6cdb3c2c0864518f93e7777f0ddc3ed8721fcb1
tree1f9f14e3595692b6a0ce6e46e79463908acdadb1
parente5698bb4b1f3333a9d93a28579d2de3738056a72
parent0cbccde1b0264df7a0a5f8723b8de881f0d5f927
Mega-Merge remote branch 'dream/master' into mm

Conflicts:
configure.ac
data/skin_default.xml
enigma2.bb
lib/Makefile.am
lib/base/Makefile.am
lib/base/filepush.cpp
lib/base/filepush.h
lib/components/Makefile.am
lib/dvb/Makefile.am
lib/dvb/dvb.cpp
lib/dvb/pmt.cpp
lib/dvb/pmt.h
lib/python/Components/Renderer/Picon.py
lib/python/Components/UsageConfig.py
lib/python/Plugins/Extensions/DVDPlayer/plugin.py
lib/python/Plugins/SystemPlugins/CommonInterfaceAssignment/plugin.py
lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
lib/python/Screens/ChannelSelection.py
lib/python/enigma_python.i
lib/service/servicedvb.cpp
main/Makefile.am
main/bsod.cpp
main/enigma.cpp
mytest.py
po/LINGUAS
po/Makefile.am
46 files changed:
Makefile.am
configure.ac
data/Makefile.am
data/fonts/Makefile.am
enigma2.bb
lib/base/Makefile.am
lib/base/filepush.cpp
lib/base/filepush.h
lib/base/rawfile.cpp
lib/components/Makefile.am
lib/dvb/Makefile.am
lib/dvb/db.cpp
lib/dvb/dvb.cpp
lib/dvb/dvb.h
lib/dvb/frontend.cpp
lib/dvb/idvb.h
lib/dvb/pmt.cpp
lib/dvb/pmt.h
lib/dvb/scan.cpp
lib/dvb/sec.cpp
lib/dvb/tstools.cpp
lib/gdi/glcddc.cpp
lib/gdi/grc.cpp
lib/gdi/grc.h
lib/gdi/lcd.cpp
lib/python/Components/NimManager.py
lib/python/Components/UsageConfig.py
lib/python/Plugins/SystemPlugins/NFIFlash/flasher.py
lib/python/Plugins/SystemPlugins/SoftwareManager/plugin.py
lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py
lib/python/Screens/ChannelSelection.py
lib/python/Screens/Setup.py
lib/python/Screens/Wizard.py
lib/python/enigma_python.i
lib/service/iservice.h
lib/service/service.cpp
lib/service/service.h
lib/service/servicedvb.cpp
lib/service/servicedvb.h
lib/service/servicemp3.cpp
lib/service/servicemp3.h
main/bsod.cpp
main/enigma-gdi.cpp
mytest.py
po/Makefile.am
skin.py