Dane Springmeyer 03fdf7e596 Merge branch '2.3.x' of github.com:mapnik/mapnik ... Conflicts: src/deepcopy.cpp src/expression.cpp src/rule.cpp		2013-11-13 20:00:13 -08:00
..
cpp_tests	Merge branch '2.3.x' of github.com:mapnik/mapnik	2013-11-03 23:10:21 -08:00
data	topojson: built up knowledge of attributes and geometry type + tests	2013-10-29 00:37:41 -07:00
python_tests	Merge branch '2.3.x' of github.com:mapnik/mapnik	2013-11-13 20:00:13 -08:00
visual_tests	tests: smaller font sizes and ensure labels are on top	2013-11-08 18:41:00 -08:00
run_tests.py	python tests: print exception if nose is unavailable	2013-04-05 22:51:53 -07:00