修正merge

2020-11-28 18:03:28 +08:00
parent 9c14005cde
commit f17724c7ef
3 changed files with 5 additions and 14 deletions
--- a/conf.lua
+++ b/conf.lua
@@ -35,5 +35,5 @@ function love.conf(t)
 	M.math,M.data=true,true
 	M.timer,M.graphics,M.font,M.image=true,true,true,true
 	M.mouse,M.touch,M.keyboard,M.joystick=true,true,true,true
-	M.physics,M.thread,M.video=false,true,false
+	M.physics,M.thread,M.video=false,false,false
 end