Blake Thompson b2c1c86d99 Merge branch 'master' into release/image_data_Any ... Conflicts: benchmark/test_polygon_clipping.cpp		2015-02-16 14:37:01 -06:00
..
cpp_tests	Merge branch 'master' of github.com:mapnik/mapnik into release/image_data_any	2015-02-11 10:01:42 -08:00
cxx	Merge branch 'master' into release/image_data_Any	2015-02-16 14:37:01 -06:00
data	add shapeindex tests - refs #2703	2015-02-13 00:05:34 -08:00
python_tests	Merge branch 'master' into release/image_data_Any	2015-02-16 14:37:01 -06:00
visual_tests	Merge branch 'master' into release/image_data_any	2015-02-04 15:46:54 -06:00
run_tests.py	python tests: remove either paths.py data or env settings for fonts/plugins	2014-10-15 18:40:07 -07:00