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

Origin commit data
------------------
Branch: ni/coolstream
Commit: c3ed2ed700
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-01 13:10:36 +01:00
27 changed files with 143 additions and 137 deletions

View File

@@ -36,7 +36,7 @@
//NI y-funcs
#include "gui/plugins.h"
extern CPlugins *g_PluginList;
extern CPlugins *g_Plugins;
#include "gui/infoicons.h"
extern CInfoIcons *InfoIcons; /* neutrino.cpp */
#include "gui/netfs_setup.h"