Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp

2018-04-27 02:42:20 +01:00
parent b7ce21038a f42cc19aad 4bcd05a620 1e6b57675b
commit 1fe0bb76b9
120 changed files with 2652 additions and 1496 deletions
--- a/src/os/macosx/osx_stdafx.h
+++ b/src/os/macosx/osx_stdafx.h
@@ -54,6 +54,13 @@
 #define MAC_OS_X_VERSION_10_9 1090
 #endif

+#ifndef MAC_OS_X_VERSION_10_10
+#define MAC_OS_X_VERSION_10_10 101000
+#endif
+
+#ifndef MAC_OS_X_VERSION_10_11
+#define MAC_OS_X_VERSION_10_11 101100
+#endif

 #define __STDC_LIMIT_MACROS
 #include <stdint.h>