Merge branch 'master' into earcut-polygon

Browse Source

Conflicts:
	tile.cc

...

This commit is contained in:

Eric Fischer

2016-04-26 12:09:56 -07:00

parent 62a74afbdc 2607a76c63

commit 8c82ee4c5f

18 changed files with 6701 additions and 17 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_-pD.json

+2148

File diff suppressed because one or more lines are too long

tests/ne_110m_admin_0_countries/out/-z4_-yname_-pc.json

+4102

File diff suppressed because one or more lines are too long