mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 00:41:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	src/global.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 005bd91ea9
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-01 (Sat, 01 Oct 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-01 11:04:00 +02:00
parent 2f7743c901 57c803b083
commit 134a82959d
3 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/global.h
View File

@@ -48,13 +48,6 @@
#define NEUTRINO_SCAN_SETTINGS_FILE CONFIGDIR "/scan.conf"
#define NEUTRINO_PARENTALLOCKED_FILE DATADIR "/neutrino/.plocked"
#define FONTDIR_VAR "/var/tuxbox/fonts/" //NI
#define ICONSDIR_VAR "/var/tuxbox/icons/"
#define LOCALEDIR_VAR "/var/tuxbox/locale"
#define THEMESDIR_VAR "/var/tuxbox/themes"
#define PLUGINDIR_VAR "/var/tuxbox/plugins"
#define PLUGINDIR_MNT "/mnt/plugins"
#define LOGODIR ICONSDIR "/logo"
#define LOGODIR_VAR ICONSDIR_VAR "/logo"