Merge branch 'gltf_o3dgc' of https://github.com/smalcom/assimp into gltf_o3dgc

contrib/Open3DGC/o3dgcTimer.h

@@ -27,6 +27,8 @@ THE SOFTWARE.
 #include "o3dgcCommon.h"
 
 #ifdef WIN32
+/* Thank you, Microsoft, for file WinDef.h with min/max redefinition. */
+#define NOMINMAX
 #include <windows.h>
 #elif __MACH__
 #include <mach/clock.h>