Merge branch 'master' into InputContinuation

# Conflicts:
#	source/games/duke/src/duke3d.h
This commit is contained in:
Christoph Oelckers 2020-10-10 21:39:27 +02:00
commit fe2e96d3a6
163 changed files with 17720 additions and 13915 deletions

View file

@ -23,7 +23,7 @@
#include "v_2ddrawer.h"
#include "v_draw.h"
#include "stats.h"
#include "menu.h"
#include "razemenu.h"
#include "version.h"
#include "earcut.hpp"
#include "gamestate.h"