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

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

Browse Source 
Conflicts:
	lib/libdvbsub/dvbsub.cpp
	lib/libtuxtxt/tuxtxt.cpp
	src/driver/lcdd.cpp
	src/zapit/src/femanager.cpp


Origin commit data
------------------
Commit: 40c7218952
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
This commit is contained in:
vanhofen
2017-02-12 23:04:09 +01:00
parent bf8fcf42be 999b2cf2ce
commit 6057caae9a
35 changed files with 111 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/scanepg.cpp
View File

@@ -91,7 +91,7 @@ void CEpgScan::ConfigureEIT()
count++;
}
}
INFO("added %d channels to EIT white list\n", count);
INFO("added %d channels to EIT white list", count);
}
void CEpgScan::Clear()