Merge remote branch 'upstream/master'

2012-02-07 10:22:55 -06:00 · 2012-02-07 10:22:55 -06:00 · 526d5881c7
commit 526d5881c7
parent 8f9006e594 87aabf3eca
2 changed files with 3 additions and 0 deletions
--- a/src/main/resources/configuration.txt
+++ b/src/main/resources/configuration.txt
@ -126,6 +126,7 @@ components:
    type: coord
    label: "Location"
    hidey: false
+    show-mcr: false
    
  #- class: org.dynmap.ClientComponent
  #  type: logo