mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +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/movieplayer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 461f9f046d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-06 (Tue, 06 Dec 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-12-06 13:02:25 +01:00
parent 34033b62a8 1d951d42c0
commit dc58fffbea
8 changed files with 84 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/moviebrowser/mb.h
View File

@@ -164,6 +164,7 @@ class CMovieBrowser : public CMenuTarget
CBox m_cBoxFrameFootRel;
CBox m_cBoxFrameTitleRel;
CComponentsHeader *m_header;
CComponentsDetailLine *m_detailsLine;
CComponentsChannelLogo *m_channelLogo;
CComponentsPicture *m_movieCover;