mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-29 16:31:05 +02:00
Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
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:
@@ -70,6 +70,7 @@
|
||||
#include <driver/display.h>
|
||||
#include <driver/volume.h>
|
||||
#include <driver/radiotext.h>
|
||||
#include <driver/fontrenderer.h>
|
||||
|
||||
#include <zapit/satconfig.h>
|
||||
#include <zapit/femanager.h>
|
||||
|
Reference in New Issue
Block a user