Merge remote branch 'origin/devel'

Conflicts: docs/config.rst
2012-06-03 21:15:12 -04:00
parent f0d48347a4 85c439b68c
commit 97c3f8f913
11 changed files with 452 additions and 95 deletions
--- a/overviewer_core/tileset.py
+++ b/overviewer_core/tileset.py
@@ -516,7 +516,7 @@ class TileSet(object):
                defaultZoom = 1,
                maxZoom = self.treedepth,
                path = self.options.get('name'),
-                base = '',
+                base = self.options.get('base'),
                bgcolor = bgcolorformat(self.options.get('bgcolor')),
                world = self.options.get('worldname_orig') +
                    (" - " + self.options.get('dimension') if self.options.get('dimension') != 'default' else ''),