Merge remote-tracking branch 'origin/master' into vulkan2
This commit is contained in:
commit
b8dfb3c136
73 changed files with 398 additions and 191 deletions
|
|
@ -926,5 +926,4 @@ DEFINE_GLOBAL(CleanXfac_1)
|
|||
DEFINE_GLOBAL(CleanYfac_1)
|
||||
DEFINE_GLOBAL(CleanWidth_1)
|
||||
DEFINE_GLOBAL(CleanHeight_1)
|
||||
DEFINE_GLOBAL(generic_hud)
|
||||
DEFINE_GLOBAL(generic_ui)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue