Merge branch 'master' into plugins

This commit is contained in:
Eric Fischer
2017-07-06 22:28:35 -07:00
60 changed files with 25959 additions and 1901 deletions
+2
View File
@@ -19,3 +19,5 @@ extern size_t max_tile_size;
int mkstemp_cloexec(char *name);
FILE *fopen_oflag(const char *name, const char *mode, int oflag);
#define MAX_ZOOM 24