mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +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:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/lua/lua_misc.cpp
	src/neutrino.cpp
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: 3420991007
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)
This commit is contained in:
vanhofen
2016-11-19 21:11:54 +01:00
parent 092b774d90 42023644db
commit cc7ad7ce1a
112 changed files with 2965 additions and 2923 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/info_menue.cpp
View File

@@ -44,7 +44,7 @@
#if 0
#include <gui/buildinfo.h>
#endif
#include <gui/widget/messagebox.h> //NI
#include <gui/widget/msgbox.h> //NI
#include <driver/screen_max.h>
#include "gui/cam_menu.h"
@@ -75,7 +75,7 @@ int CInfoMenu::exec(CMenuTarget* parent, const std::string &actionKey) //NI
#ifdef BOXMODEL_APOLLO
sprintf(str, "%scs_get_chip_type(): 0x%04X\n", str, cs_get_chip_type());
#endif
ShowMsg(LOCALE_MESSAGEBOX_INFO, str, CMessageBox::mbrBack, CMessageBox::mbBack);
ShowMsg(LOCALE_MESSAGEBOX_INFO, str, CMsgBox::mbrBack, CMsgBox::mbBack);
return res;
}