Merge branch 'cst-next' into nmp-cst-next

Origin commit data
------------------
Branch: ni/coolstream
Commit: f89463dc08
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-16 (Sat, 16 Jan 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2016-01-16 07:22:31 +01:00
32 changed files with 159 additions and 133 deletions

View File

@@ -80,6 +80,7 @@ class CInfoViewer
int ChanNameY;
int ChanWidth;
int ChanHeight;
int numbox_offset;
CSectionsdClient::CurrentNextInfo info_CurrentNext;
CSectionsdClient::CurrentNextInfo oldinfo;