Merge branch 'master' into multithread

This commit is contained in:
Eric Fischer
2015-07-08 16:36:58 -07:00
5 changed files with 47 additions and 14 deletions
+1
View File
@@ -31,5 +31,6 @@ int traverse_zooms(int *geomfd, off_t *geom_size, char *metabase, char *stringpo
extern unsigned initial_x, initial_y;
extern int geometry_scale;
extern int quiet;
#define TEMP_FILES 64