Pulled from master, fixed conflict

2021-04-07 21:28:15 +05:00
parent 3b287e5981 0bd64a0f78
commit 81fd1c0f3e
44 changed files with 3172 additions and 696 deletions
--- a/koptilnya/steering/input.txt
+++ b/koptilnya/steering/input.txt
@@ -0,0 +1,5 @@
+Input = class("Input")
+
+function Input:initialize(keyMap)
+
+end