Merge branch 'feature/is_solid_move' of github.com:mapnik/mapnik into feature/is_solid_move

Browse source

Conflicts:
	include/mapnik/image_util.hpp

...

This commit is contained in:

Blake Thompson 2015-01-15 11:00:40 -06:00

parent 73d9c60168 508521d5e5

commit 0a1a0b405b

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