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/moviebrowser.cpp


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



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-08-09 15:37:20 +02:00
parent 509011c3c9 a0203076f2
commit 0a47dbd97a
6 changed files with 145 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/epgview.h
View File

@@ -84,6 +84,7 @@ class CEpgData
std::vector<epg_pair> epgText;
std::vector<epg_pair> epgText_saved;
std::string epgTextSwitch;
std::string extMovieInfo;
int topheight,topboxheight;
int buttonheight,botboxheight;
int medlineheight,medlinecount;