Merge branch 'miami' into lcs

# Conflicts:
#	utils/gxt/german.txt
This commit is contained in:
Sergeanur 2021-07-10 02:07:14 +03:00
commit 71d1b46417
3 changed files with 9 additions and 3 deletions

View file

@ -468,6 +468,11 @@ static_assert(false, "SUPPORT_XBOX_SCRIPT and SUPPORT_MOBILE_SCRIPT are mutually
#undef DISABLE_LOADING_SCREEN
#undef DISABLE_VSYNC_ON_TEXTURE_CONVERSION
#undef EXTENDED_COLOURFILTER
#undef EXTENDED_PIPELINES
#undef SCREEN_DROPLETS
#undef NEW_RENDERER
#undef FIX_SPRITES
#define PC_WATER