Merge branch 'master' into earcut-polygon

Conflicts:
	geojson.c
	tile.h
This commit is contained in:
Eric Fischer
2016-04-05 15:22:43 -07:00
6 changed files with 10385 additions and 378 deletions
+2
View File
@@ -48,6 +48,8 @@ static int additional_options[] = {
A_LINE_DROP,
#define A_DEBUG_POLYGON ((int) 'd')
A_DEBUG_POLYGON,
#define A_PREFER_RADIX_SORT ((int) 'r')
A_PREFER_RADIX_SORT,
};
static int prevent_options[] = {