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

..

build.py

add permissive flag to ogr and shape plugins to work around boost interprocess compile bug - closes #1082 - refs #950 and #1001

2012-02-14 10:33:40 -08:00

ogr_converter.cpp

+ add typedef size_type to mapnik::vertex_vector

2012-02-15 15:16:33 +00:00

ogr_converter.hpp

finish geometry cleanup work by ensuring proper behavior in the ogr plugin with multigeometries

2011-12-21 12:22:05 -08:00

ogr_datasource.cpp

Merge branch 'new-xml'

2012-03-13 11:11:28 +01:00

ogr_datasource.hpp

finish refactor, moving to separate method off datasources to get_geometry_type and using enums all around

2012-01-17 01:09:46 -05:00

ogr_feature_ptr.hpp

plugin code formatting based on emacs format in utils/format_source_files

2011-11-13 19:37:50 -08:00

ogr_featureset.cpp

whitespace fixes

2012-02-01 17:37:35 -08:00

ogr_featureset.hpp

whitespace fixes

2012-02-01 17:37:35 -08:00

ogr_index_featureset.cpp

remove uneeded default cases

2012-02-24 18:58:12 -08:00

ogr_index_featureset.hpp

whitespace fixes

2012-02-01 17:37:35 -08:00

ogr_index.hpp

plugin code formatting based on emacs format in utils/format_source_files

2011-11-13 19:37:50 -08:00

ogr_layer_ptr.hpp

plugin code formatting based on emacs format in utils/format_source_files

2011-11-13 19:37:50 -08:00