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

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

Browse Source 
Conflicts:
	src/gui/epgview.h
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: a29d0613ee
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-20 (Mon, 20 Mar 2017)
This commit is contained in:
vanhofen
2017-03-20 14:34:45 +01:00
parent 3c4259100b ded87fe941
commit 3154424592
12 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/neutrino_menue.cpp
View File

@@ -137,8 +137,6 @@ void CNeutrinoApp::InitMenuMain()
{
dprintf(DEBUG_DEBUG, "init mainmenue\n");
//NI unsigned int system_rev = cs_get_revision();
// Dynamic renumbering
personalize.setShortcut();