vanhofen bb60fbe8a2 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox ...

Conflicts:
	src/driver/fb_accel.h
	src/driver/fb_accel_cs_hd1.cpp
	src/driver/fb_accel_cs_hd2.cpp
	src/driver/fb_generic.cpp
	src/driver/fb_generic.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 58b3f87cf5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-20 (Mon, 20 Feb 2017)



------------------
This commit was generated by Migit

2017-02-20 12:29:23 +01:00

..

libtuxtxt.cpp

libtuxtxt: Transfer from neutrino-mp for better compatibility

2017-02-15 18:38:03 +01:00

Makefile.am

libtuxtxt: Transfer from neutrino-mp for better compatibility

2017-02-15 18:38:03 +01:00

teletext.h

Remove some globals from vcrcontrol

2011-01-25 17:22:38 +00:00

tuxtxt2.conf

network menu (#264)

2010-03-15 20:49:03 +00:00

tuxtxt_common.h

Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

2017-02-15 21:52:59 +01:00

tuxtxt_def.h

our current experimental Neutrino branch

2009-12-08 11:05:11 +00:00

tuxtxt.cpp

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

2017-02-20 12:29:23 +01:00

tuxtxt.h

tuxtxt: convert to int-pointer arithmetic, work with all framebuffers

2017-02-15 18:38:03 +01:00