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
commit 904090cbb6
46 changed files with 155 additions and 144 deletions

View file

@ -1,4 +1,4 @@
#define WITH_D3D
#define WITHD3D
#include "common.h"
#include "main.h"