monster merge...

all those changes marshmellow did..  and more...
This commit is contained in:
iceman1001 committed 2017-07-30 09:17:48 +02:00
1 parent 208550823d
commit f28da2da6e
107 files changed
+5087 -3777

No files matched your search

+1 -1
View File
@@ -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>