mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 23:42:51 +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/moviebrowser/mb.cpp
	src/gui/osd_setup.cpp
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 318b4926e7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-25 12:22:47 +02:00
parent f23c56ed95 c1bda7d95c
commit 01acc7d9ae
8 changed files with 112 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/system/helpers.cpp
View File

@@ -1254,7 +1254,7 @@ std::vector<std::string> split(const std::string &s, char delim)
return vec;
}
#if __cplusplus <= 201103L
#if __cplusplus < 201103L
std::string to_string(int i)
{
std::stringstream s;