mapnik/plugins/input
Dane Springmeyer 9e9747ffad Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
Conflicts:
	src/agg/process_building_symbolizer.cpp
	src/cairo_context.cpp
	src/cairo_renderer.cpp
	src/grid/process_building_symbolizer.cpp
	src/grid/process_line_pattern_symbolizer.cpp
	src/grid/process_text_symbolizer.cpp
	tests/python_tests/images/support/marker-text-line-scale-factor-0.899.png
	tests/python_tests/images/support/marker-text-line-scale-factor-1.5.png
	tests/python_tests/images/support/marker-text-line-scale-factor-1.png
	tests/python_tests/images/support/marker-text-line-scale-factor-10.png
	tests/python_tests/images/support/marker-text-line-scale-factor-100.png
	tests/python_tests/images/support/marker-text-line-scale-factor-2.png
	tests/python_tests/images/support/marker-text-line-scale-factor-5.png
	tests/visual_tests/images/lines-5-200-200-1.0-agg-reference.png
	tests/visual_tests/images/lines-5-200-200-2.0-agg-reference.png
	tests/visual_tests/images/lines-5-400-400-1.0-agg-reference.png
	tests/visual_tests/images/lines-5-400-400-2.0-agg-reference.png
	tests/visual_tests/images/lines-5-600-600-1.0-agg-reference.png
	tests/visual_tests/images/lines-5-600-600-2.0-agg-reference.png
	tests/visual_tests/images/lines-5-800-800-1.0-agg-reference.png
	tests/visual_tests/images/lines-5-800-800-2.0-agg-reference.png
	tests/visual_tests/images/lines-6-200-200-2.0-agg-reference.png
	tests/visual_tests/images/lines-6-400-400-2.0-agg-reference.png
	tests/visual_tests/images/lines-6-600-600-2.0-agg-reference.png
	tests/visual_tests/images/lines-6-800-800-2.0-agg-reference.png
	tests/visual_tests/test.py
2014-04-24 21:44:28 -07:00
..
csv minimum boost version is 1.47 - remove obsolete code handling older versions 2014-01-27 13:19:21 -08:00
gdal Merge branch 'master' of github.com:mapnik/mapnik into expr-v2 2014-04-24 21:44:28 -07:00
geojson minimum boost version is 1.47 - remove obsolete code handling older versions 2014-01-27 13:19:21 -08:00
occi Merge branch '2.3.x' of github.com:mapnik/mapnik 2014-04-24 14:50:55 -07:00
ogr Merge branch 'master' of github.com:mapnik/mapnik into expr-v2 2014-04-24 21:44:28 -07:00
osm Merge branch 'master' of github.com:mapnik/mapnik into expr-v2 2014-04-24 21:44:28 -07:00
postgis Merge branch '2.3.x' of github.com:mapnik/mapnik 2014-04-24 14:50:55 -07:00
python Merge branch '2.3.x' of github.com:mapnik/mapnik 2013-11-03 23:10:21 -08:00
raster symbolizer-expressions replayed against latest master 2013-11-27 22:50:15 -08:00
rasterlite more consistent memset/memcpy usage 2014-01-28 15:05:10 -08:00
shape attempt to handle multi-polygons in shape.input 2014-02-24 15:20:06 +00:00
sqlite scons: simplify linkflags/ldflags setting / attempt to fix #2025 2013-10-22 16:35:46 -04:00
templates scons: simplify linkflags/ldflags setting / attempt to fix #2025 2013-10-22 16:35:46 -04:00
topojson minimum boost version is 1.47 - remove obsolete code handling older versions 2014-01-27 13:19:21 -08:00