merge conflict thingy

2021-06-24 08:39:11 +02:00
parent 84c2b06c8b 313180c932
commit 746fa0afba
21 changed files with 378 additions and 20 deletions
--- a/appveyor-macos.yml
+++ b/appveyor-macos.yml
@ -31,6 +31,8 @@ install:
  - haxelib git extension-webm https://github.com/KadeDev/extension-webm
  - haxelib run lime rebuild extension-webm macos
  - haxelib install linc_luajit
+  - haxelib install actuate
+  - haxelib git extension-webm https://github.com/KadeDev/extension-webm
  - haxelib list
  - cd /Users/appveyor/projects/kade-engine-macos