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

Merge branch 'next' into next-cc

Browse Source 
Conflicts:
	data/locale/english.locale
	src/driver/framebuffer.cpp
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/moviebrowser.cpp


Origin commit data
------------------
Commit: 6f8ef9ec46
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-02 (Sun, 02 Jun 2013)
This commit is contained in:
[CST] Focus
2013-06-02 10:46:42 +04:00
parent 24393838b7 8efd5b483b
commit 499d23e6a6
35 changed files with 1525 additions and 811 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/widget/icons.h
View File

@@ -244,6 +244,7 @@
#define NEUTRINO_ICON_HINT_FACTORY "hint_factory"
/* misc */
#define NEUTRINO_ICON_HINT_YTPLAY "hint_ytplay"
#define NEUTRINO_ICON_VARPATH "/var/share/tuxbox/neutrino/icons/" //alternatively path for user-defined icons