Merge branch 'master' into careminster

This commit is contained in:
Melanie
2012-08-11 17:32:30 +01:00
13 changed files with 378 additions and 286 deletions

View File

@@ -939,7 +939,7 @@
FixedTimeStep = .01667
MaxCollisionsPerFrame = 2048
MaxUpdatesPerFrame = 2048
MaxUpdatesPerFrame = 8192
[RemoteAdmin]
enabled = false