mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-30 00:41:09 +02:00
Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
src/nhttpd/web/Makefile.am
src/nhttpd/web/Y_Blocks.txt
src/nhttpd/web/Y_Menue.yhtm
src/nhttpd/web/Y_Settings_yWeb.yhtm
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6d6873b047
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-01 (Sat, 01 Oct 2016)
------------------
This commit was generated by Migit
This commit is contained in:
@@ -96,4 +96,8 @@ NEUTRINO_CPP CRadioText *g_Radiotext;
|
||||
#define ENABLE_GUI_MOUNT
|
||||
#endif
|
||||
|
||||
#ifndef TARGET_PREFIX
|
||||
#define TARGET_PREFIX ""
|
||||
#endif
|
||||
|
||||
#endif /* __neutrino_global_h__ */
|
||||
|
Reference in New Issue
Block a user