Merge branch 'brushbsp' of https://github.com/ericwa/ericw-tools into brushbsp

# Conflicts:
#	maputil/maputil.cc
This commit is contained in:
Jonathan 2023-09-07 14:56:00 -04:00
commit 2e3ed6c0a2
1 changed files with 4 additions and 4 deletions

View File

@ -19,10 +19,10 @@ See file, 'COPYING', for details.
#include <cstdint>
#include <common\entdata.h>
#include <common\parser.hh>
#include <common\log.hh>
#include <common\mapfile.hh>
#include <common/entdata.h>
#include <common/parser.hh>
#include <common/log.hh>
#include <common/mapfile.hh>
#include <common\settings.hh>
#include <common\bsputils.hh>
#include <common\json.hh>