sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
mapnik/include
History
Hermann Kraus 438e2c4de7 Merge commit 'bb27156df0a111fdecfe87b48d27b2866b7a2816' into harfbuzz 
Conflicts:
	include/mapnik/font_engine_freetype.hpp
	include/mapnik/grid/grid_renderer.hpp
	include/mapnik/placement_finder.hpp
	include/mapnik/processed_text.hpp
	include/mapnik/text/formatting/registry.hpp
	include/mapnik/text/placements/registry.hpp
	include/mapnik/text_path.hpp
2013-03-16 13:11:29 +01:00
..
mapnik Merge commit 'bb27156df0a111fdecfe87b48d27b2866b7a2816' into harfbuzz 2013-03-16 13:11:29 +01:00
build.py Merge commit '57aa6dd05230876bf7c022d3554436e4d35de77f' into harfbuzz 2013-03-16 12:46:01 +01:00