monster merge...

all those changes marshmellow did.. and more...
2017-07-30 09:17:48 +02:00
parent 208550823d
commit f28da2da6e
107 changed files with 5087 additions and 3777 deletions
--- a/client/util_posix.c
+++ b/client/util_posix.c
@@ -106,7 +106,7 @@ void msleep(uint32_t n) {


 // a milliseconds timer for performance measurement
-uint64_t msclock() {
+uint64_t msclock(void) {
 #if defined(_WIN32)
 	#include <sys/types.h>