Merge pull request #669

Browse Source

Merge branch 'player_marker' of https://github.com/JonnyJD/Minecraft-Overviewer into devel

Conflicts:
	genPOI.py
	overviewer_core/data/js_src/views.js

...

This commit is contained in:

Andrew Chin

2012-04-14 22:42:27 -04:00

parent 2a6769c5ac 122eaee37d

commit 5f1bf1851d

4 changed files with 45 additions and 0 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/web_assets/bed.png Normal file

Binary file not shown.

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