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
..
input	Merge branch 'master' of github.com:mapnik/mapnik into expr-v2	2014-03-10 00:05:56 -07:00