sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
mapnik/deps/agg
History
Dane Springmeyer 08fa9fd8ec Merge branch '2.3.x' of github.com:mapnik/mapnik 
Conflicts:
	bindings/python/mapnik_building_symbolizer.cpp
	bindings/python/mapnik_debug_symbolizer.cpp
	bindings/python/mapnik_line_pattern_symbolizer.cpp
	bindings/python/mapnik_line_symbolizer.cpp
	bindings/python/mapnik_markers_symbolizer.cpp
	bindings/python/mapnik_point_symbolizer.cpp
	bindings/python/mapnik_polygon_symbolizer.cpp
	bindings/python/mapnik_python.cpp
	bindings/python/mapnik_raster_symbolizer.cpp
	bindings/python/mapnik_shield_symbolizer.cpp
	bindings/python/mapnik_symbolizer.cpp
2013-11-07 09:21:05 -08:00
..
include Merge branch '2.3.x' of github.com:mapnik/mapnik 2013-11-07 09:21:05 -08:00
src + use c++ headers 2013-03-01 11:08:58 -05:00
build.py Merge branch '2.3.x' of github.com:mapnik/mapnik 2013-11-07 09:21:05 -08:00
copying remove tinyxml, no longer needed by boost ptree as it bundles rapidxml now 2011-10-11 20:02:50 -07:00