mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-31 09:21:18 +02:00
Conflicts: data/scripts/Makefile.am src/gui/cam_menu.cpp src/gui/imageinfo_ni.cpp src/gui/osd_setup.cpp src/gui/update.cpp src/gui/update.h src/gui/update_menue.cpp src/neutrino.cpp src/system/setting_helpers.cpp Signed-off-by: Thilo Graf <dbt@novatux.de>
12.pcf,gz, 14B.pcf.gz and 15B.pcf.gz are Bitmap fonts taken from X11. Original names are 6x12-ISO8859-1.pcf.gz 7x14-ISO8859-1.pcf.gz 9x15-ISO8859-1.pcf.gz Fontnames inside the fonts have been patched to Fix12,Fix14,Fix15 (original name Fixed), cause tuxbox lcd-fontrenderer does not support 2 files for the same font with diffrent pixel sizes.