mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 15:32:52 +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

1
lib/sectionsdclient/sectionsdclient.h
View File

@@ -163,7 +163,6 @@ class CSectionsdClient : private CBasicClient
typedef struct
{
int scanMode;
int epg_cache;
int epg_old_events;
int epg_max_events;