mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 17:01:08 +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/channellist.cpp
	src/gui/widget/menue.cpp
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8d4677a319
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-21 (Thu, 21 Sep 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-09-21 10:32:33 +02:00
parent 23417d8cef 6e8b743e1e
commit dd377dff8f
13 changed files with 355 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/system/helpers.h
View File

@@ -155,4 +155,6 @@ std::string get_path(const char * path);
std::string check_var(const char * file);
inline bool file_exists(const std::string file) { return file_exists(file.c_str()); }
std::string readFile(std::string file);
#endif