Dane Springmeyer 9e9747ffad Merge branch 'master' of github.com:mapnik/mapnik into expr-v2 ... Conflicts: src/agg/process_building_symbolizer.cpp src/cairo_context.cpp src/cairo_renderer.cpp src/grid/process_building_symbolizer.cpp src/grid/process_line_pattern_symbolizer.cpp src/grid/process_text_symbolizer.cpp tests/python_tests/images/support/marker-text-line-scale-factor-0.899.png tests/python_tests/images/support/marker-text-line-scale-factor-1.5.png tests/python_tests/images/support/marker-text-line-scale-factor-1.png tests/python_tests/images/support/marker-text-line-scale-factor-10.png tests/python_tests/images/support/marker-text-line-scale-factor-100.png tests/python_tests/images/support/marker-text-line-scale-factor-2.png tests/python_tests/images/support/marker-text-line-scale-factor-5.png tests/visual_tests/images/lines-5-200-200-1.0-agg-reference.png tests/visual_tests/images/lines-5-200-200-2.0-agg-reference.png tests/visual_tests/images/lines-5-400-400-1.0-agg-reference.png tests/visual_tests/images/lines-5-400-400-2.0-agg-reference.png tests/visual_tests/images/lines-5-600-600-1.0-agg-reference.png tests/visual_tests/images/lines-5-600-600-2.0-agg-reference.png tests/visual_tests/images/lines-5-800-800-1.0-agg-reference.png tests/visual_tests/images/lines-5-800-800-2.0-agg-reference.png tests/visual_tests/images/lines-6-200-200-2.0-agg-reference.png tests/visual_tests/images/lines-6-400-400-2.0-agg-reference.png tests/visual_tests/images/lines-6-600-600-2.0-agg-reference.png tests/visual_tests/images/lines-6-800-800-2.0-agg-reference.png tests/visual_tests/test.py		2014-04-24 21:44:28 -07:00
..
build.py	fix static linking of gdal/ogr plugins on linux - refs mapnik/mapnik-packaging#123	2014-02-27 14:40:09 -08:00
ogr_converter.cpp	c++11 : use nullptr instead of NULL	2013-11-27 15:54:16 +00:00
ogr_converter.hpp	'include what you use' in plugins to set up for future forward declarations in mapnik/feature.hpp and mapnik/datasource.hpp	2012-07-24 19:21:55 -07:00
ogr_datasource.cpp	Merge branch '2.3.x' of github.com:mapnik/mapnik	2014-04-24 14:50:55 -07:00
ogr_datasource.hpp	+ replace <boost/shared_ptr.hpp> with <memory>	2013-09-20 14:13:23 +01:00
ogr_featureset.cpp	Merge branch 'master' of github.com:mapnik/mapnik into expr-v2	2014-02-09 13:27:24 -08:00
ogr_featureset.hpp	symbolizer-expressions replayed against latest master	2013-11-27 22:50:15 -08:00
ogr_index.hpp	- improved again the logging facilities	2012-04-09 03:00:51 +02:00
ogr_index_featureset.cpp	c++11 : use nullptr instead of NULL	2013-11-27 15:54:16 +00:00
ogr_index_featureset.hpp	use const std::unique_ptr<> instead of boost::scoped_ptr<>	2013-09-20 14:22:58 +01:00
ogr_layer_ptr.hpp	c++11 : use nullptr instead of NULL	2013-11-27 15:54:16 +00:00