mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-26 23:13:00 +02:00
Conflicts:
configure.ac
data/fonts/Makefile.am
src/gui/cam_menu.cpp
src/gui/update.cpp
src/zapit/src/capmt.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5db35f49c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
------------------
This commit was generated by Migit
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.