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

Merge remote-tracking branch 'check/cst-next'

Browse Source 
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 66adad0811
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-07 (Sat, 07 Feb 2015)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2015-02-07 23:12:01 +01:00
parent 1b7d3b8e8d b6fde11b07
commit 31c7317205
26 changed files with 251 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/sectionsdclient/sectionsdclient.h
View File

@@ -1,7 +1,7 @@
#ifndef __sectionsdclient__
#define __sectionsdclient__
/*
Client-Interface f<EFBFBD>r zapit - DBoxII-Project
Client-Interface for zapit - DBoxII-Project
$Id: sectionsdclient.h,v 1.42 2007/01/12 22:57:57 houdini Exp $
@@ -230,8 +230,13 @@ class CEPGData
std::vector<std::string> items;
char fsk;
unsigned char table_id;
#ifdef FULL_CONTENT_CLASSIFICATION
std::string contentClassification;
std::string userClassification;
#else
unsigned char contentClassification;
unsigned char userClassification;
#endif
CEPGData()
{