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

Conflicts:
	src/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: c582725f40
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)



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

2017-03-06 22:07:52 +01:00

..

hd1/libcoolstream

move public libcoolstream-headers to hardware directory

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

hd2/libcoolstream

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

2017-03-06 22:07:52 +01:00

hardware_caps.cpp

port hardware_caps from Neutrino-MP

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

hardware_caps.h

port hardware_caps from Neutrino-MP

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

Makefile.am

move public libcoolstream-headers to hardware directory

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