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:
	configure.ac
	data/fonts/Makefile.am
	src/gui/cam_menu.cpp
	src/gui/update.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5db35f49c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-12 21:54:48 +01:00
parent a99fe21b74 ed047027d1
commit 4ac4e963ad
41 changed files with 206 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/system/flashtool.cpp
View File

@@ -181,7 +181,7 @@ bool CFlashTool::program( const std::string & filename, int globalProgressEndEra
std::string flashfile;
bool skipCopy = false;
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
if (strcmp(dn, "/tmp") != 0) {
uint64_t btotal = 0, bused = 0;
long bsize = 0;
@@ -705,7 +705,7 @@ int CMTDInfo::getMTDEraseSize( const std::string & filename )
std::string CMTDInfo::findMTDsystem()
{
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
std::string sysfs = "root0";
#else
std::string sysfs = "systemFS";