Compare commits
1 Commits
c6ce9940a6
...
48d65424a0
| Author | SHA1 | Date | |
|---|---|---|---|
| 48d65424a0 |
@@ -39,14 +39,11 @@ globals = {
|
|||||||
"MysteriousManScreen",
|
"MysteriousManScreen",
|
||||||
"DiscussionWindow",
|
"DiscussionWindow",
|
||||||
"EndWindow",
|
"EndWindow",
|
||||||
<<<<<<< HEAD
|
|
||||||
"PlayerNameWindow",
|
"PlayerNameWindow",
|
||||||
"TextInput",
|
"TextInput",
|
||||||
"CodeGenerator",
|
"CodeGenerator",
|
||||||
"CreditsWindow",
|
"CreditsWindow",
|
||||||
=======
|
|
||||||
"GameOverWindow",
|
"GameOverWindow",
|
||||||
>>>>>>> develop
|
|
||||||
"mset",
|
"mset",
|
||||||
"mget",
|
"mget",
|
||||||
"btnp",
|
"btnp",
|
||||||
|
|||||||
Reference in New Issue
Block a user