Sync from Upstream

2019-03-15 21:17:07 +01:00
parent ea53e1f981
commit 6a52b6074f
161 changed files with 2002 additions and 1463 deletions
--- a/client/scandir.h
+++ b/client/scandir.h
@@ -19,4 +19,4 @@ extern int scandir(const char *dir, struct dirent ***namelist, int (*select)(con
 extern int alphasort(const struct dirent **a, const struct dirent **b);
 #endif // _WIN32

-#endif // SCANDIR_H__
+#endif // SCANDIR_H__