Merge branch 'master' into sdl_extract

2018-02-05 22:41:57 +03:00
parent a525df2eba bf5025f053
commit eb4a66072a
30 changed files with 2072 additions and 44 deletions
--- a/src/studio.h
+++ b/src/studio.h
@@ -64,6 +64,7 @@
 #define PROJECT_LUA_EXT ".lua"
 #define PROJECT_MOON_EXT ".moon"
 #define PROJECT_JS_EXT ".js"
+#define PROJECT_WREN_EXT ".wren"

 typedef struct
 {