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

Merge branch 'ni/mp' into ni/cst-next

Browse Source 
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)
This commit is contained in:
vanhofen
2016-08-26 19:13:47 +02:00
parent 01add923d6 6e38f7b956
commit bc33663742
220 changed files with 7577 additions and 1615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/driver/framebuffer.h
View File

@@ -21,6 +21,8 @@
Boston, MA 02110-1301, USA.
*/
#include "framebuffer_ng.h"
#if 0
#ifndef __framebuffer__
#define __framebuffer__
@@ -331,7 +333,9 @@ class CFrameBuffer : public sigc::trackable
void fbNoCheck(bool noCheck) { fb_no_check = noCheck; }
void doPaintMuteIcon(bool mode) { do_paint_mute_icon = mode; }
void blit(void) {}
void mark(int, int, int, int) {}
sigc::signal<void> OnAfterSetPallette;
};
#endif
#endif