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

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
114 changed files with 4038 additions and 104 deletions

View File

@@ -47,6 +47,7 @@
#include "debug.h"
#include <global.h>
#include <driver/fontrenderer.h>
#include <driver/framebuffer.h>
#include <system/helpers.h>
#include <gui/update_ext.h>
using namespace std;