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

Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox

Browse Source 
Conflicts:
	configure.ac
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 11d7263bcd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-09-25 11:41:44 +02:00
parent cd18fa9ca0 8869126425
commit b6954dec34
15 changed files with 55 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/epgview.cpp
View File

@@ -1318,7 +1318,7 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start
}
break;
}
case CRCInput::RC_help:
case CRCInput::RC_info:
bigFonts = bigFonts ? false : true;
ResetModules();
frameBuffer->paintBackgroundBoxRel(sx, sy, ox, oy);