Merge branch 'master' into pu/mp

This commit is contained in:
M. Liebmann
2017-09-19 23:21:21 +02:00
8 changed files with 122 additions and 34 deletions

View File

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