mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 01:11:06 +02:00
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
src/neutrino.cpp
Origin commit data
------------------
Commit: eee55893c6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-05 (Thu, 05 Jan 2017)
This commit is contained in:
@@ -272,7 +272,7 @@ CMovieBrowser::~CMovieBrowser()
|
||||
delete m_movieCover;
|
||||
|
||||
if (m_header)
|
||||
delete m_header; m_header = NULL;
|
||||
delete m_header;
|
||||
}
|
||||
|
||||
void CMovieBrowser::clearListLines()
|
||||
|
Reference in New Issue
Block a user