Merge branch 'cvs.tuxbox.org' into tripledragon
authorStefan Seyfried <seife@tuxbox-git.slipkontur.de>
Sun, 14 Feb 2010 19:08:02 +0000 (20:08 +0100)
committerStefan Seyfried <seife@tuxbox-git.slipkontur.de>
Sun, 14 Feb 2010 19:08:02 +0000 (20:08 +0100)
commit6b32272df167208d6566e066c42a36deb13cb6ca
tree519e5a345b5627946440c7644ce1ecbfe61fcb10
parent223b53db0c0da4e5bdcd88af59cec87446185e4e
parent549143be08d746559717a685ad67838dcebdd3eb
Merge branch 'cvs.tuxbox.org' into tripledragon

Conflicts:
tuxbox/enigma/configure.ac
tuxbox/enigma/include/lib/gdi/font.h
tuxbox/enigma/lib/gdi/font.cpp
tuxbox/enigma/configure.ac
tuxbox/enigma/include/lib/gdi/font.h
tuxbox/enigma/lib/dvb/epgcache.cpp
tuxbox/enigma/lib/dvb/record.cpp
tuxbox/enigma/lib/gdi/font.cpp
tuxbox/neutrino/src/driver/stream2file.cpp
tuxbox/neutrino/src/gui/neutrino_menu.cpp
tuxbox/neutrino/src/neutrino.cpp
tuxbox/neutrino/src/system/settings.h
tuxbox/tools/configure.ac