archive-gh-me/mapnik
1
0
Fork 0
mirror of https://github.com/mapnik/mapnik.git synced 2025-12-08 20:13:09 +00:00
Code Issues Projects Releases Wiki Activity
mapnik/include
History
Dane Springmeyer 8da2805d42 Merge branch 'master' into unscaled-glyphs 
Conflicts:
	include/mapnik/text/dummy_shaper.hpp
	include/mapnik/text/harfbuzz_shaper.hpp
	include/mapnik/text/icu_shaper.hpp
2014-06-18 20:40:33 -07:00
..
mapnik
Merge branch 'master' into unscaled-glyphs
2014-06-18 20:40:33 -07:00
build.py
add 'cairo' subdir
2014-06-16 11:45:10 +01:00