Merge branch 'master' into jgrpp

# Conflicts:
#	src/string.cpp
This commit is contained in:
Jonathan G Rennison
2018-06-07 06:49:18 +01:00
122 changed files with 2335 additions and 397 deletions

View File

@@ -55,6 +55,7 @@ char *FioGetFullPath(char *buf, const char *last, Searchpath sp, Subdirectory su
char *FioFindFullPath(char *buf, const char *last, Subdirectory subdir, const char *filename);
char *FioAppendDirectory(char *buf, const char *last, Searchpath sp, Subdirectory subdir);
char *FioGetDirectory(char *buf, const char *last, Subdirectory subdir);
void FioCreateDirectory(const char *name);
const char *FiosGetScreenshotDir();