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 branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/driver/fb_accel_sti.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: b3319a4561
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-26 (Tue, 26 Sep 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-09-26 16:01:46 +02:00
parent 3608379abe 94b5fa194b
commit 553da74b03
9 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/epgview.cpp
View File

@@ -1306,7 +1306,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);