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

Merge branch 'dvbsi++' into next

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 43d825b62e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-04 (Mon, 04 Feb 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2013-02-04 10:06:00 +04:00
parent 4d4d24e7fa 0ab0473c6e
commit e802f73d5c
7 changed files with 81 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/system/locals.h
View File

@@ -232,7 +232,6 @@ typedef enum
LOCALE_CHANNELLIST_EPGTEXT_ALIGN_LEFT,
LOCALE_CHANNELLIST_EPGTEXT_ALIGN_RIGHT,
LOCALE_CHANNELLIST_EXTENDED,
LOCALE_CHANNELLIST_MINITV,
LOCALE_CHANNELLIST_FAVS,
LOCALE_CHANNELLIST_FOOT,
LOCALE_CHANNELLIST_FOOT_FREQ,
@@ -248,6 +247,7 @@ typedef enum
LOCALE_CHANNELLIST_MAKE_HDLIST,
LOCALE_CHANNELLIST_MAKE_NEWLIST,
LOCALE_CHANNELLIST_MAKE_REMOVEDLIST,
LOCALE_CHANNELLIST_MINITV,
LOCALE_CHANNELLIST_NEW_ZAP_MODE,
LOCALE_CHANNELLIST_NONEFOUND,
LOCALE_CHANNELLIST_PROVS,
@@ -764,9 +764,9 @@ typedef enum
LOCALE_MENU_HINT_CHANNELLIST_COLORED,
LOCALE_MENU_HINT_CHANNELLIST_EPG_ALIGN,
LOCALE_MENU_HINT_CHANNELLIST_EXTENDED,
LOCALE_MENU_HINT_CHANNELLIST_MINITV,
LOCALE_MENU_HINT_CHANNELLIST_FONTS,
LOCALE_MENU_HINT_CHANNELLIST_FOOT,
LOCALE_MENU_HINT_CHANNELLIST_MINITV,
LOCALE_MENU_HINT_CHANNELLIST_SETUP,
LOCALE_MENU_HINT_CI,
LOCALE_MENU_HINT_COLORS,