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

Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/gui/epgview.h


Origin commit data
------------------
Commit: e61a23cb74
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)
This commit is contained in:
vanhofen
2017-02-08 08:02:39 +01:00
parent 89db97735e 65c62740eb
commit 0707fef642
114 changed files with 4038 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/screensaver.cpp
View File

@@ -43,6 +43,7 @@
#include <gui/color_custom.h>
#include <gui/infoclock.h>
#include <zapit/zapit.h>
#include <driver/pictureviewer/pictureviewer.h>
#include <video.h>
extern cVideo * videoDecoder;
@@ -325,4 +326,4 @@ bool CScreenSaver::IsRun()
if(thrScreenSaver)
return true;
return false;
}
}