mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 01:11:06 +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/icons/headers/pictureviewer.png
	data/locale/english.locale
	src/global.h
	src/gui/components/cc_frm_footer.h
	src/gui/eventlist.cpp
	src/gui/pictureviewer.cpp
	src/gui/widget/icons.h
	src/gui/widget/menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: a8ef409ff6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-06-15 10:37:41 +02:00
parent 386786c4a2 915d9f0676
commit 8e6aebc8d4
27 changed files with 292 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/neutrino.cpp
View File

@@ -2277,6 +2277,10 @@ void wake_up( bool &wakeup)
int CNeutrinoApp::run(int argc, char **argv)
{
puts("[neutrino] executing " NEUTRINO_APP_START_SCRIPT ".");
if (my_system(NEUTRINO_APP_START_SCRIPT) != 0)
perror(NEUTRINO_APP_START_SCRIPT " failed");
CmdParser(argc, argv);
TIMER_START();