Merge branch 'master' into sdl_extract

2018-02-11 11:39:42 +03:00
parent 3c40e171fc dc1e939d9c
commit e377fa9987
3 changed files with 29 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,6 @@ build/android/libs/
 build/android/obj/
 build/itch.io/tic.js
 build/itch.io/console.zip
-build/html/tic.js
 build/uwp/code8/ARM/
 build/uwp/code8/x64/
 build/uwp/code8/code8.VC.db