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

Conflicts:
	lib/hardware/coolstream/hd2/libcoolstream/cs_api.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8c95f1f7a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-10 (Fri, 10 Mar 2017)



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

2017-03-10 15:10:04 +01:00

..

hd1/libcoolstream

hd1/libcoolstream/cs_api.h: Update for new libcoolstream functions

2017-03-10 14:35:32 +01:00

hd2/libcoolstream

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

2017-03-10 15:10:04 +01:00

hardware_caps.cpp

hardware_caps: just changes in comments

2017-03-10 15:07:52 +01:00

hardware_caps.h

port hardware_caps from Neutrino-MP

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

Makefile.am

hardware_caps/Makefile: use @HWLIB_CFLAGS@ instead of defines

2017-03-10 15:07:52 +01:00