Merge branch 'master' into py-package

2011-05-12 19:21:46 -04:00
parent e8f9a8bf3e d2c9b80239
commit e64af5baef
6 changed files with 215 additions and 54 deletions
--- a/overviewer_core/googlemap.py
+++ b/overviewer_core/googlemap.py
@@ -128,6 +128,7 @@ class MapGen(object):
        index = open(indexpath, 'r').read()
        index = index.replace(
                "{time}", str(strftime("%a, %d %b %Y %H:%M:%S +0000", gmtime())))
+        index = index.replace("{version}", util.findGitVersion())

        with open(os.path.join(self.destdir, "index.html"), 'w') as output:
            output.write(index)