Merge branch 'master' into earcut-polygon

Browse Source

Conflicts:
	geojson.c
	tile.h

...

This commit is contained in:

Eric Fischer

2016-04-07 13:50:04 -07:00

parent 1e31edbfb3 1792a13e1a

commit 1e6332bae8

9 changed files with 2674 additions and 46 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

tests/ne_110m_admin_0_countries/out/-z4_-yname_--drop-polygons.json

+2566

File diff suppressed because one or more lines are too long