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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/gui/miscsettings_menu.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: ddbd537865
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-20 (Mon, 20 Mar 2017)
This commit is contained in:
vanhofen
2017-03-20 15:53:10 +01:00
parent 111e2ac676 3154424592
commit 2691bb1543
19 changed files with 151 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/imageinfo_ni.cpp
View File

@@ -39,8 +39,6 @@
#include <sys/utsname.h>
#include <daemonc/remotecontrol.h>
#include <system/flashtool.h>
#include <video.h>
#include <unistd.h>
@@ -58,8 +56,6 @@
#include <linux/version.h>
extern CRemoteControl * g_RemoteControl; /* neutrino.cpp */
#include <gui/pictureviewer.h>
extern CPictureViewer * g_PicViewer;