mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 10:21:04 +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
------------------
Commit: c4fa0eb30e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
This commit is contained in:
vanhofen
2017-03-13 12:45:30 +01:00
parent 8c65bc5cf0 9c009ade29
commit 30fd965086
21 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/widget/menue.h
View File

@@ -494,7 +494,7 @@ class CMenuWidget : public CMenuTarget, public CComponentsSignals
private:
mn_widget_id_t widget_index;
CMenuGlobal *mglobal;
CComponentsDetailLine *details_line;
CComponentsDetailsLine *details_line;
CComponentsInfoBox *info_box;
int hint_height;
CComponentsHeader *header;