4f4e2b001e
Conflicts: SConstruct benchmark/run.cpp bindings/python/mapnik_datasource.cpp bindings/python/mapnik_feature.cpp bindings/python/python_optional.hpp include/mapnik/css_color_grammar.hpp include/mapnik/expression_grammar.hpp include/mapnik/feature.hpp include/mapnik/feature_style_processor_impl.hpp include/mapnik/image_filter_types.hpp include/mapnik/image_util.hpp include/mapnik/json/geometry_generator_grammar.hpp include/mapnik/json/geometry_grammar.hpp include/mapnik/processed_text.hpp include/mapnik/tiff_io.hpp include/mapnik/util/geometry_svg_generator.hpp include/mapnik/util/geometry_wkt_generator.hpp include/mapnik/utils.hpp include/mapnik/webp_io.hpp include/mapnik/wkt/wkt_grammar.hpp plugins/input/shape/shape_datasource.cpp plugins/input/shape/shapefile.hpp src/expression_grammar.cpp src/expression_string.cpp src/image_util.cpp src/json/feature_collection_parser.cpp src/json/feature_parser.cpp src/miniz.c src/symbolizer_helpers.cpp src/tiff_reader.cpp src/webp_reader.cpp tests/cpp_tests/geometry_converters_test.cpp tests/cpp_tests/image_io_test.cpp tests/cpp_tests/map_request_test.cpp tests/python_tests/image_test.py tests/visual_tests/test.py |
||
|---|---|---|
| .. | ||
| mapnik | ||
| build.py | ||