Merge branch 'master' into new-map-data

2013-08-28 00:50:58 +01:00
parent 571a17d84b abab680a00
commit e793be9855
8 changed files with 49 additions and 5 deletions
--- a/code/boot.js
+++ b/code/boot.js
@ -444,6 +444,7 @@ function boot() {
    shadowSize: new L.Point(41, 41)
  }});

+  window.setupIdle();
  window.setupTaphold();
  window.setupStyles();
  window.setupDialogs();