Merge branch 'master' into careminster

This commit is contained in:
Melanie
2010-01-11 03:50:24 +00:00
5 changed files with 22 additions and 4 deletions

View File

@@ -326,6 +326,7 @@
ConsoleUser = "Test"
ConsolePass = "secret"
http_listener_port = 9000
console_port = 0
default_location_x = 1000
default_location_y = 1000