mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 16:31:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	lib/libdvbsub/dvbsubtitle.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Commit: 69d8616a91
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)
This commit is contained in:
vanhofen
2017-03-12 22:03:03 +01:00
parent 1f3de3b531 7dd5854d20
commit 9d255f3f05
32 changed files with 593 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/update.cpp
View File

@@ -141,9 +141,7 @@ void CFlashUpdate::update_php(std::string &url, const char* type)
if (url.find("update.php") != std::string::npos)
{
url += "?revision=" + to_string(cs_get_revision());
#ifdef BOXMODEL_CS_HD2
url += "&chip_type=" + to_string(cs_get_chip_type());
#endif
url += "&image_type=" + (std::string)type;
printf("[update_php] url %s\n", url.c_str());
}