mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 10:21:04 +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
------------------
Branch: ni/coolstream
Commit: 6f8ef9ec46
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-02 (Sun, 02 Jun 2013)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2013-06-02 10:46:42 +04:00
parent a27bcc6d3b 279a60341d
commit 93eb0c1679
35 changed files with 1525 additions and 811 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/system/settings.h
View File

@@ -213,6 +213,7 @@ struct SNeutrinoSettings
//movieplayer menu
P_MPLAYER_MBROWSER,
P_MPLAYER_FILEPLAY,
P_MPLAYER_YTPLAY,
//feature keys
P_FEAT_KEY_FAVORIT,
@@ -393,6 +394,7 @@ struct SNeutrinoSettings
int mpkey_time;
int mpkey_bookmark;
int mpkey_plugin;
int mpkey_subtitle;
int key_timeshift;
int key_plugin;