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
..
basiccurl.cpp	c++11 : use nullptr instead of NULL	2013-11-27 15:54:16 +00:00
basiccurl.h	use c++ style includes	2011-11-09 16:45:18 -08:00
build.py	Merge branch '2.3.x' of github.com:mapnik/mapnik	2014-04-24 14:50:55 -07:00
dataset_deliverer.cpp	c++11 : use nullptr instead of NULL	2013-11-27 15:54:16 +00:00
dataset_deliverer.h	remove unused iostream includes and unnecessary usage of ostringstream - refs #1055	2012-12-06 23:06:12 -08:00
libMakefile	remove tabs	2011-04-02 03:45:50 +00:00
Makefile.example	remove tabs	2011-04-02 03:45:50 +00:00
osm.cpp	c++11 : use nullptr instead of NULL	2013-11-27 15:54:16 +00:00
osm.h	refactor expression and value type usage to speed up compile time	2013-01-08 14:17:31 -08:00
osm_datasource.cpp	c++11 : use nullptr instead of NULL	2013-11-27 15:54:16 +00:00
osm_datasource.hpp	+ replace <boost/shared_ptr.hpp> with <memory>	2013-09-20 14:13:23 +01:00
osm_featureset.cpp	Merge branch '2.3.x' of github.com:mapnik/mapnik	2014-04-24 14:50:55 -07:00
osm_featureset.hpp	use const std::unique_ptr<> instead of boost::scoped_ptr<>	2013-09-20 14:22:58 +01:00
osmparser.cpp	c++11 : use nullptr instead of NULL	2013-11-27 15:54:16 +00:00
osmparser.h	Stop the osm input plugin truncating ID values on 32 bit platforms	2013-07-11 00:39:52 +01:00
osmtagtypes.h	- aligned coding style in osm plugin	2011-10-22 16:04:05 +02:00
render.cpp	symbolizer-expressions replayed against latest master	2013-11-27 22:50:15 -08:00
test.cpp	c++11 : use nullptr instead of NULL	2013-11-27 15:54:16 +00:00
test.osm	mapnik osm plugin initial commit	2008-03-01 11:49:37 +00:00
test.xml	remove tabs	2011-04-02 03:45:50 +00:00
test2.osm	mapnik osm plugin initial commit	2008-03-01 11:49:37 +00:00
test2.xml	remove tabs	2011-04-02 03:45:50 +00:00
test3.xml	remove tabs	2011-04-02 03:45:50 +00:00