Merge branch 'master' of https://github.com/IvanSanchez/mapnik

Browse source

Conflicts:
	tests/visual_tests/images/polygon-winding-order-300-300-1.0-agg-reference.png
	tests/visual_tests/images/polygon-winding-order-300-300-1.0-cairo-reference.png
	tests/visual_tests/images/polygon-winding-order-300-300-2.0-agg-reference.png
	tests/visual_tests/images/polygon-winding-order-300-300-2.0-cairo-reference.png

...

This commit is contained in:

Iván Sánchez Ortega 2014-08-22 16:32:29 +02:00

parent dd4e2336c4 bebe5e9e3a

commit 3b32185bd9

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available