Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3c35e98212
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-25 (Fri, 25 Aug 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-08-25 14:15:22 +02:00
40 changed files with 225 additions and 133 deletions

View File

@@ -679,6 +679,7 @@ string COPKGManager::getPkgDescription(std::string pkgName, std::string pkgDesc)
return pkgDesc;
fpos_t fz;
fz.__pos = 0;
fseek(fd, 0, SEEK_END);
fgetpos(fd, &fz);
fseek(fd, 0, SEEK_SET);