4 Commits

Author	SHA1	Message	Date
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
Michael Liebmann	063adf347d	hd2/libcoolstream/*.h: Update for new libcoolstream functions ... - cs_get_lib_version() - cs_compare_lib_versions() - GetVideoSystem() - GetVideoSystemFormatName() - Add CS_CHIP_NEVIS definitions Origin commit data ------------------ Branch: ni/coolstream Commit: ab6ca5b606 Author: Michael Liebmann <tuxcode.bbg@gmail.com> Date: 2017-03-10 (Fri, 10 Mar 2017) ------------------ This commit was generated by Migit	2017-03-10 14:35:32 +01:00
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
vanhofen	a60fcac65b	move public libcoolstream-headers to hardware directory ... Origin commit data ------------------ Branch: ni/coolstream Commit: 2029a684e5 Author: vanhofen <vanhofen@gmx.de> Date: 2017-03-06 (Mon, 06 Mar 2017) Origin message was: ------------------ - move public libcoolstream-headers to hardware directory ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit	2017-03-06 21:49:32 +01:00