Merge branch 'master' into py-package

Browse Source

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

...

This commit is contained in:

Aaron Griffith

2011-05-10 20:19:10 -04:00

parent 299f15a312 cc91808036

commit 383b01859f

32 changed files with 2373 additions and 859 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

BIN

overviewer_core/data/textures/portal.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 672 B