Merge branch 'master' into pu/mp

Conflicts:
	src/gui/miscsettings_menu.cpp
	src/neutrino.cpp
	src/system/settings.h
This commit is contained in:
svenhoefer
2017-03-20 01:31:51 +01:00
12 changed files with 174 additions and 141 deletions

View File

@@ -358,6 +358,7 @@ void CLCD::setlcdparameter(int dimm, const int contrast, const int power, const
perror("[lcdd] set invert failed!");
}
#if 0
if (g_info.box_Type == CControld::TUXBOX_MAKER_PHILIPS)
{
if (ioctl(fd, LCD_IOCTL_BIAS, &bias) < 0)
@@ -365,6 +366,7 @@ void CLCD::setlcdparameter(int dimm, const int contrast, const int power, const
perror("[lcdd] set bias failed!");
}
}
#endif
close(fd);
}
#endif