Merge remote-tracking branch 'origin/miami' into lcs

# Conflicts:
#	src/modelinfo/BaseModelInfo.cpp
This commit is contained in:
Sergeanur
2021-01-23 15:14:15 +02:00
46 changed files with 155 additions and 144 deletions

View File

@ -1,5 +1,4 @@
#define WITHWINDOWS
#define WITH_D3D
#define WITHD3D
#include "common.h"
#ifdef EXTENDED_COLOURFILTER