Merge branch 'master' into accurate

This commit is contained in:
Clownacy 2019-08-31 00:26:34 +01:00
commit da46ff8746

View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#ifdef WINDOWS #ifdef WINDOWS
#include <Windows.h> #include <windows.h>
// Avoid name collisions // Avoid name collisions
#undef DrawText #undef DrawText
#undef FindResource #undef FindResource