mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 01:11:06 +02:00
src/neutrino.cpp: fix conflict, remove old code
Origin commit data
------------------
Commit: a343a64883
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-20 (Tue, 20 Mar 2012)
This commit is contained in:
@@ -1776,8 +1776,6 @@ TIMER_START();
|
|||||||
//init video settings
|
//init video settings
|
||||||
g_videoSettings = new CVideoSettings;
|
g_videoSettings = new CVideoSettings;
|
||||||
g_videoSettings->setVideoSettings();
|
g_videoSettings->setVideoSettings();
|
||||||
if(display_language_selection)
|
|
||||||
videoDecoder->ShowPicture(DATADIR "/neutrino/icons/start.jpg");
|
|
||||||
|
|
||||||
g_RCInput = new CRCInput();
|
g_RCInput = new CRCInput();
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user