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
------------------
Branch: ni/coolstream
Commit: e61a23cb74
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-08 08:02:39 +01:00
parent 3451ef6f9f 68a1c5e30e
commit 54d7d92401
114 changed files with 4038 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/plugins.h
View File

@@ -32,7 +32,6 @@
#ifndef __plugins__
#define __plugins__
#include <driver/framebuffer.h>
#include <system/localize.h>
#include <plugin.h>
@@ -40,6 +39,7 @@
#include <string>
#include <vector>
class CFrameBuffer;
class CPlugins
{