sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
mapnik/demo
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
..
c++ merge with 2.3.x 2013-10-28 14:45:52 -07:00
data convert old tests into proper python tests - closes #1460 2013-05-16 12:23:19 -07:00
python improve the c++ and python demo apps to conditionally output image formats 2013-09-18 14:32:43 -07:00
simple-renderer Add simple render script. 2012-09-10 02:42:59 +02:00
viewer Merge branch '2.3.x' of github.com:mapnik/mapnik 2013-11-07 09:21:05 -08:00