Dane Springmeyer 6433d9482e Merge branch 'master' of github.com:mapnik/mapnik into expr-v2 ... Conflicts: include/mapnik/symbolizer.hpp src/agg/agg_renderer.cpp src/agg/process_line_pattern_symbolizer.cpp src/agg/process_line_symbolizer.cpp src/agg/process_polygon_pattern_symbolizer.cpp src/agg/process_polygon_symbolizer.cpp src/cairo_renderer.cpp src/feature_type_style.cpp src/grid/process_line_pattern_symbolizer.cpp src/grid/process_line_symbolizer.cpp src/grid/process_markers_symbolizer.cpp src/grid/process_polygon_pattern_symbolizer.cpp src/grid/process_polygon_symbolizer.cpp		2014-03-10 00:05:56 -07:00
..
composited	fix dst-over alpha handling - closes #1995 - refs #1452 and 5e84ce0	2013-09-20 13:37:34 -07:00
pycairo	tests: update expected cairo outputs after #2087	2013-11-22 21:56:19 +00:00
style-comp-op	more expected image test updates	2014-01-27 16:28:34 -08:00
style-image-filter	more expected image test updates	2014-01-27 16:28:34 -08:00
support	Merge branch 'master' of github.com:mapnik/mapnik into expr-v2	2014-03-10 00:05:56 -07:00