Files
recycled-ni-neutrino/data/fonts
vanhofen 483c39bef1 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	acinclude.m4
	configure.ac
	data/fonts/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	data/webtv/Makefile.am
	data/y-web/Y_Tools_Boxcontrol.yhtm
	data/y-web/Y_Tools_Screenshot.yhtm
	lib/hardware/coolstream/hardware_caps.h
	lib/libtuxtxt/tuxtxt_common.h
	src/gui/audioplayer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/movieplayer.cpp
	src/gui/movieplayer.h
	src/gui/network_setup.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: ae4307bc1c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-02 (Thu, 02 Nov 2017)



------------------
This commit was generated by Migit
2017-11-02 23:25:41 +01:00
..
2010-03-15 20:49:03 +00:00
2017-10-29 18:26:44 +01:00
2010-01-16 09:32:13 +00:00
2010-01-16 09:32:13 +00:00
2010-01-30 12:55:23 +00:00
2010-01-16 09:32:13 +00:00

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.