Merge remote-tracking branch 'check/next-cc'

broken, needs buildfixing


Origin commit data
------------------
Branch: ni/coolstream
Commit: add688bbb8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-23 (Sun, 23 Feb 2014)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2014-02-23 15:17:48 +01:00
23 changed files with 644 additions and 96 deletions

View File

@@ -558,6 +558,7 @@ struct SNeutrinoSettings
FONT_TYPE_INFOBAR_SMALL,
FONT_TYPE_FILEBROWSER_ITEM,
FONT_TYPE_MENU_HINT,
FONT_TYPE_SUBTITLES,
FONT_TYPE_COUNT
};