Merge branch 'master' into earcut-polygon

Browse Source

Conflicts:
	Makefile

...

This commit is contained in:

Eric Fischer

2016-03-29 15:18:01 -07:00

parent 10cd9c8875 5d701913ab

commit 4da5a1996b

11 changed files with 167 additions and 47 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/named/alb

+1

File diff suppressed because one or more lines are too long

tests/named/alg

+1

File diff suppressed because one or more lines are too long

tests/named/out/-z0_-Lalgeria@tests%named%alg_-Lalbania@tests%named%alb.json

+26

File diff suppressed because one or more lines are too long

tests/named/out/-z0_-Lalgeria@tests%named%alg_-Lalbania@tests%named%alb_-lunified.json

+22

File diff suppressed because one or more lines are too long

tests/named/sweden.json

+1

File diff suppressed because one or more lines are too long