vanhofen 73c370ab33 Merge branch 'pu/mp' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox ...

Conflicts:
	src/gui/components/cc_frm_footer.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: fd25630d53
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-30 (Wed, 30 Aug 2017)

2017-08-30 18:11:59 +02:00

..

hd1/libcoolstream

Revert "HD1: Workaround for missing cs_get_chip_type"

2017-06-16 19:33:29 +02:00

hd2/libcoolstream

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

2017-03-26 23:25:43 +02:00

hardware_caps.cpp

Merge branch 'master' into pu/mp

2017-08-21 13:13:03 +02:00

hardware_caps.h

port hardware_caps from Neutrino-MP

2017-03-06 21:49:32 +01:00

Makefile.am

hw_caps: remove CFEManager-code; ...

2017-08-21 12:56:00 +02:00