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
..
base.cpp	Remove has_dimensions and dimensions from text_placement_info.	2012-03-04 16:38:40 +01:00
dummy.cpp	avoid constructing extra temp object	2012-03-12 13:22:07 -07:00
list.cpp	Warn about unused XML elements.	2012-03-12 02:12:58 +01:00
registry.cpp	Merge branch 'new-xml'	2012-03-13 11:11:28 +01:00
simple.cpp	Merge branch 'new-xml'	2012-03-13 11:11:28 +01:00