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

Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: ee90a7e353
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-02 (Tue, 02 Aug 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-08-02 12:51:05 +02:00
parent 5686d74f2e e93066ed22
commit 57d01e1fbe
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/epgview.h
View File

@@ -68,8 +68,8 @@ class CEpgData
bool bigFonts;
bool has_follow_screenings;
bool call_fromfollowlist;
bool tmdbtoggle;
int stars;
bool tmdb_active;
int stars;
time_t tmp_curent_zeit;
uint64_t prev_id;