Merge branch 'master' of https://github.com/mapnik/mapnik into cmake-support

2021-08-13 20:44:55 +02:00 · 2021-08-13 20:44:55 +02:00 · 0198cad883
commit 0198cad883
parent 4b4cfca706 29eea37b38
2 changed files with 2 additions and 1 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1 +1,2 @@
 *.svg text eol=lf
+scons/** linguist-vendored
--- a/test/data
+++ b/test/data
@ -1 +1 @@
-Subproject commit dd0c41c3f9f5dc98291a727af00bb42734d2a8c0
+Subproject commit fa984e0a1a8b6e37229c7ddfdbc9f980d56ec1a5