mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-02 02:11:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'test/cst-next'

Browse Source 
Conflicts:
	src/gui/osdlang_setup.cpp
This commit is contained in:
Stefan Seyfried
2015-02-19 14:10:26 +01:00
parent 51bbb756e8 d1ca82ab44
commit 48fdfc5e5e
23 changed files with 86 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/widget/menue.cpp
View File

@@ -2069,6 +2069,7 @@ CMenuForwarder::CMenuForwarder(const std::string& Text, const bool Active, const
void CMenuForwarder::setOption(const std::string &Option)
{
option_string = Option;
option_string_ptr = &option_string;
}
int CMenuForwarder::getWidth(void)