Merge commit 'aba0cdf8718a41a4ac3397131b45d272d119d60b' into megamerge (mostly)
authorMike Looijmans <milo-software@users.sourceforge.net>
Sun, 17 Oct 2010 08:42:52 +0000 (10:42 +0200)
committerMike Looijmans <milo-software@users.sourceforge.net>
Sun, 17 Oct 2010 08:42:52 +0000 (10:42 +0200)
commit35ea35415f0f321397a34ab70fe34deb54ecba31
tree3eb15fed7f9e4b57516458187db0024d476a5753
parent3518b5287b95c16e415ddf97977f5a3ede24230e
parentaba0cdf8718a41a4ac3397131b45d272d119d60b
Merge commit 'aba0cdf8718a41a4ac3397131b45d272d119d60b' into megamerge (mostly)

- font does not support 16-bit yet
- skin does not support screen id=2 (for new 96x64 displays)

Conflicts:
data/skin.xml
data/skin_default.xml
data/skin_default/icons/Makefile.am
lib/gdi/font.cpp
lib/gdi/lcd.cpp
lib/python/Components/ParentalControl.py
lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py
lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
mytest.py
skin.py
19 files changed:
data/skin.xml
data/skin_default.xml
data/skin_default/icons/Makefile.am
lib/dvb/dvb.cpp
lib/dvb/dvb.h
lib/gdi/font.cpp
lib/gdi/glcddc.cpp
lib/gdi/lcd.cpp
lib/gdi/lcd.h
lib/gui/elistboxcontent.cpp
lib/gui/elistboxcontent.h
lib/python/Components/ParentalControl.py
lib/python/Plugins/Extensions/DVDPlayer/plugin.py
lib/python/Plugins/Extensions/MediaPlayer/plugin.py
lib/python/Plugins/SystemPlugins/Videomode/VideoWizard.py
lib/python/Screens/Satconfig.py
lib/python/Screens/Standby.py
main/enigma.cpp
mytest.py