Ryan Rector
|
4ee15e8f44
|
Code cleanup to simplify upstream merge
|
2011-08-04 12:49:49 -06:00 |
|
Ryan Rector
|
1b25f187ff
|
Merge remote-tracking branch 'upstream/master' into configurable-north
|
2011-08-03 20:41:09 -06:00 |
|
Thomas Lake
|
26acd21fbf
|
Add percentage to the "X/Y tiles complete for level" message
|
2011-08-02 20:32:24 +01:00 |
|
Aaron Griffith
|
e84ef2c1d2
|
Merge branch 'master' into py-package
Conflicts:
overviewerConfig.js
overviewer_core/data/overviewerConfig.js
setup.py
web_assets/overviewerConfig.js
|
2011-05-13 21:37:35 -04:00 |
|
Aaron Griffith
|
383b01859f
|
Merge branch 'master' into py-package
Conflicts:
overviewer_core/data/config.js
overviewer_core/data/web_assets/functions.js
overviewer_core/data/web_assets/style.css
setup.py
web_assets/overviewer.css
web_assets/style.css
|
2011-05-10 20:19:10 -04:00 |
|
Aaron Griffith
|
42596416d9
|
sdist and install now work
next step is using a custom data dir, and falling back on the package
data dir. Also, fixing --version.
|
2011-03-29 13:49:50 -04:00 |
|