artemp 10196f35b4 Merge branch 'c++11' into c++11-revised ... Conflicts: bindings/python/python_grid_utils.cpp include/mapnik/font_engine_freetype.hpp include/mapnik/value.hpp src/agg/process_building_symbolizer.cpp src/cairo_renderer.cpp src/grid/process_building_symbolizer.cpp		2013-09-23 08:53:36 +01:00
..
python	Merge branch 'c++11' into c++11-revised	2013-09-23 08:53:36 +01:00