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	Only one grammar object per XML tree.	2012-03-11 23:24:28 +01:00
expression.cpp	Warn about unused XML elements.	2012-03-12 02:12:58 +01:00
format.cpp	Only one grammar object per XML tree.	2012-03-11 23:24:28 +01:00
list.cpp	Split file.	2012-02-17 15:50:24 +01:00
registry.cpp	Warn about unused XML elements.	2012-03-12 02:12:58 +01:00
text.cpp	Merge branch 'new-xml'	2012-03-13 11:11:28 +01:00