Merge branch 'master' into script-commands

3 files changed, 4 insertions, 4 deletions

diff --git a/extras b/extras
-Subproject 7bf5fcab90a2861b4a8f5b5c193838ff3470a69
+Subproject f3fb1f24eaffce571d3fe5555adf41232aad3f6
diff --git a/preprocessor.py b/preprocessor.py
index 54fc4cbff..5c71fe226 100644
--- a/preprocessor.py
+++ b/preprocessor.py
@@ -3,7 +3,7 @@
 
 import sys
 
-import extras.pokemontools.config as conf
+import extras.pokemontools.configuration as configuration
 import extras.pokemontools.preprocessor as preprocessor
 
 from extras.pokemontools.crystal import (
@@ -50,7 +50,7 @@ def preprocess(config, macros, lines=None):
     return processor.preprocess(lines=lines)
 
 def main():
-    config = conf.Config()
+    config = configuration.Config()
     macros = load_pokecrystal_macros()
     return preprocess(config, macros)
 
diff --git a/prequeue.py b/prequeue.py
index c8b12fd70..2adb03bfb 100644
--- a/prequeue.py
+++ b/prequeue.py
@@ -8,12 +8,12 @@ a single process.
 import os
 import sys
 
-import extras.pokemontools.config as conf
+import extras.pokemontools.configuration as configuration
 
 import preprocessor
 
 def main():
-    config = conf.Config()
+    config = configuration.Config()
     macros = preprocessor.load_pokecrystal_macros()
 
     stdout = sys.stdout