Merge branch 'master' into pu/mp

This commit is contained in:
Jacek Jendrzej
2017-09-13 13:52:49 +02:00
2 changed files with 1 additions and 3 deletions

View File

@@ -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"