Merge branch 'master' into vulkan

2020-12-13 18:41:07 +03:00
parent c14e3770a2
commit 4617dc5569
115 changed files with 4290 additions and 3872 deletions
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -29,6 +29,7 @@ init:
  - git config --global core.autocrlf input

 install:
+  - cmd: vcpkg integrate remove
  - cmd: xb setup

 platform: Windows