mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-09-01 09:51:22 +02:00
Merge branch 'master' into pu/mp
This commit is contained in:
@@ -101,7 +101,6 @@
|
||||
#define NEUTRINO_ICON_MOUNTED "mounted"
|
||||
#define NEUTRINO_ICON_MULTIMEDIA "multimedia"
|
||||
#define NEUTRINO_ICON_MOVIEPLAYER "icon_movieplayer"
|
||||
#define NEUTRINO_ICON_NKPLAY "icon_nkplay"
|
||||
#define NEUTRINO_ICON_YTPLAY "icon_ytplay"
|
||||
#define NEUTRINO_ICON_NOT_MOUNTED "not_mounted"
|
||||
#define NEUTRINO_ICON_PAUSE "mp_pause"
|
||||
@@ -295,7 +294,6 @@
|
||||
#define NEUTRINO_ICON_GREEN_9 "9-green"
|
||||
|
||||
/* misc */
|
||||
#define NEUTRINO_ICON_HINT_NKPLAY "hint_nkplay"
|
||||
#define NEUTRINO_ICON_HINT_YTPLAY "hint_ytplay"
|
||||
#define NEUTRINO_ICON_HINT_SPARK "hint_spark"
|
||||
|
||||
|
Reference in New Issue
Block a user