Dane Springmeyer 71e7faed0d Merge branch 'master' of github.com:mapnik/mapnik into release/image_data_any ... Conflicts: tests/python_tests/image_test.py tests/python_tests/image_tiff_test.py tests/visual_tests/images/tiff-opaque-edge-raster2-600-400-1.0-agg-reference.png tests/visual_tests/images/tiff-opaque-edge-raster2-600-400-2.0-agg-reference.png		2015-02-03 00:05:15 -08:00
..
composited	finish python bindings + tests for #1448 and #1432	2014-08-04 12:10:26 -07:00
pycairo	update visual test images after #2671	2015-02-02 20:23:45 -08:00
style-comp-op	update visual test images after agg rgba improvements	2014-12-03 12:10:49 -05:00
style-image-filter	update expected visual images against freetype 2.5.4	2014-12-22 13:48:40 -08:00
support	Merge branch 'master' of github.com:mapnik/mapnik into release/image_data_any	2015-02-03 00:05:15 -08:00
actual.png	embed help text labeling expected vs actual for side-by-side images	2015-01-26 21:58:27 -08:00
expected.png	embed help text labeling expected vs actual for side-by-side images	2015-01-26 21:58:27 -08:00