Merge remote-tracking branch 'tuxbox/master'

This commit is contained in:
Stefan Seyfried
2017-02-11 11:18:45 +01:00
32 changed files with 217 additions and 174 deletions

View File

@@ -526,6 +526,8 @@ const char *CFlashVersionInfo::getReleaseCycle(void) const
const char *CFlashVersionInfo::getType(void) const
{
// TODO: localize it
switch (snapshot)
{
case '0':
@@ -540,6 +542,8 @@ const char *CFlashVersionInfo::getType(void) const
return "Settings";
case 'A':
return "Addon";
case 'U':
return "Update";
case 'T':
return "Text";
default: