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
..
csv	Include correct file in csv datasource.	2012-03-11 23:07:39 +01:00
gdal	Complete new XML structure.	2012-03-07 19:16:41 +01:00
geos	Complete new XML structure.	2012-03-07 19:16:41 +01:00
kismet	Revert "update rasterlite, occi, csv, hello_world, and rundemo"	2012-03-09 15:33:36 +00:00
occi	Revert "update rasterlite, occi, csv, hello_world, and rundemo"	2012-03-09 15:33:36 +00:00
ogr	Merge branch 'new-xml'	2012-03-13 11:11:28 +01:00
osm	formatting to use const& as per 6462af3	2012-03-05 11:10:04 -08:00
postgis	Merge branch 'new-xml'	2012-03-13 11:11:28 +01:00
raster	whitespace fixes	2012-02-01 17:37:35 -08:00
rasterlite	Revert "update rasterlite, occi, csv, hello_world, and rundemo"	2012-03-09 15:33:36 +00:00
shape	Revert "shape: check if multiple parts are interior rings or separate"	2012-02-26 22:11:22 -08:00
sqlite	Complete new XML structure.	2012-03-07 19:16:41 +01:00
templates	Revert "update rasterlite, occi, csv, hello_world, and rundemo"	2012-03-09 15:33:36 +00:00