Merge branch 'master' into py-package

Browse Source

Conflicts:
	overviewerConfig.js
	overviewer_core/data/overviewerConfig.js
	setup.py
	web_assets/overviewerConfig.js

...

This commit is contained in:

Aaron Griffith

2011-05-13 21:37:35 -04:00

parent e64af5baef 6dd3ac067c

commit e84ef2c1d2

11 changed files with 135 additions and 81 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

overviewer_core/data/overviewerConfig.js → overviewer_core/data/web_assets/overviewerConfig.js