Merge branch 'master' into path-finding

This commit is contained in:
Bryan Bishop
2013-11-17 17:35:55 -06:00

View File

@@ -6,8 +6,8 @@ from ttk import Frame, Style
import PIL
from PIL import Image, ImageTk
import config
conf = config.Config()
import configuration
conf = configuration.Config()
#version = 'crystal'