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
..
cpp_tests	Rename filter_factory to expression.	2012-02-12 13:06:39 +01:00
data	remove notices due to inkscape metadata	2012-02-18 10:45:58 +02:00
python_tests	disable non-critical failing test after reverting shapefile polygon handling - refs #1093	2012-02-28 20:18:47 -08:00
visual_tests	Merge branch 'new-xml'	2012-03-13 11:11:28 +01:00
run_tests.py	fixup whitespace with pep8 tricks from https://gist.github.com/1903033	2012-02-24 13:13:56 -08:00