Merge branch 'master' into ignore-error

Conflicts: mbtiles.c
2026-10-02 08:25:40 +02:00 · 2016-02-01 10:10:05 -08:00
parent a84061cf87 f9a0a55578
commit 2015ba21bf
27 changed files with 32258 additions and 12 deletions
@@ -1396,7 +1396,7 @@ int read_json(int argc, char **argv, char *fname, const char *layername, int max
 			*out = '\0';

 			if (!quiet) {
-				printf("using layer %d name %s\n", i, trunc);
+				fprintf(stderr, "For layer %d, using name \"%s\"\n", i, trunc);
 			}
 		}
 	}