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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/gui/channellist.cpp
	src/gui/components/cc_detailsline.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c4fa0eb30e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-13 12:45:30 +01:00
parent 0a75d324ea 51c85e1c58
commit 7dcc90f09f
21 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/system/settings.h
View File

@@ -995,6 +995,8 @@ const time_settings_struct_t timing_setting[SNeutrinoSettings::TIMING_SETTING_CO
#define SCROLLBAR_WIDTH OFFSET_INNER_MID + 2*OFFSET_INNER_MIN
#define DETAILSLINE_WIDTH 16 // TODO: scale2Res() ?
struct SglobalInfo
{
unsigned char box_Type;