Hermann Kraus 2b68cea0a1 Merge branch 'new-xml' ... Conflicts: include/mapnik/config_error.hpp include/mapnik/ptree_helpers.hpp src/formatting/text.cpp src/libxml2_loader.cpp src/load_map.cpp src/metawriter_factory.cpp src/text_placements/registry.cpp src/text_placements/simple.cpp		2012-03-13 11:11:28 +01:00
..
mapnik	Merge branch 'new-xml'	2012-03-13 11:11:28 +01:00