mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 15:02:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

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


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



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-08-30 18:11:59 +02:00
parent 4b44169b39 44a8e0b0b4
commit fec86c7ee5
22 changed files with 236 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/hardware/coolstream/hardware_caps.cpp
View File

@@ -34,6 +34,7 @@ hw_caps_t *get_hwcaps(void) {
caps.can_ps_14_9 = 1;
caps.force_tuner_2G = 0;
strcpy(caps.boxvendor, "Coolstream");
strcpy(caps.boxarch, "Nevis");
switch (rev) {
case 6:
case 7: // Black Stallion Edition
@@ -52,7 +53,6 @@ hw_caps_t *get_hwcaps(void) {
break;
case 10:
strcpy(caps.boxname, "Zee");
strcpy(caps.boxarch, "Nevis");
caps.force_tuner_2G = 1;
break;
case 11: