Compare commits
1 Commits
codegenera
...
c6ce9940a6
| Author | SHA1 | Date | |
|---|---|---|---|
| c6ce9940a6 |
@@ -39,11 +39,14 @@ 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