Merge branch 'master' of github.com:mapbox/node-mbtiles into tilelive-refactoring

Browse Source

Conflicts:
	lib/mbtiles.js

...

This commit is contained in:

Konstantin Käfer

2011-06-27 09:34:32 +02:00

parent fc8164249e c0ed6d34ec

commit 4d8da2dbae

2 changed files with 1 additions and 1 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

test/fixtures/plain_1.mbtiles vendored

Binary file not shown.