Merge branch 'master' into multi-monitor

Conflicts: .gitignore src/CMakeLists.txt src/x11_window.c
2026-09-22 08:50:15 +00:00 · 2012-09-12 06:04:17 +02:00
parent 62cc39bd2a 64c677be9e
commit 83f5b920b9
31 changed files with 1706 additions and 279 deletions
@@ -195,7 +195,7 @@ typedef struct _GLFWlibraryWin32

    // Timer data
    struct {
-        GLboolean             hasPerformanceCounter;
+        GLboolean             hasPC;
        double                resolution;
        unsigned int          t0_32;
        __int64               t0_64;