Dane Springmeyer eca1c6e46b Merge branch 'master' of github.com:mapnik/mapnik into expr-v2 ... Conflicts: src/load_map.cpp		2013-12-09 11:40:55 -08:00
..
cpp_tests	symbolizer-expressions replayed against latest master	2013-11-27 22:50:15 -08:00
data	Merge branch 'master' of github.com:mapnik/mapnik into expr-v2	2013-12-09 11:40:55 -08:00
python_tests	tests: re-enable strict map loading tests	2013-12-02 21:51:24 -08:00
visual_tests	visual tests: fix rendering of khmer, malayalam, and bengali tests	2013-12-02 22:47:04 -08:00
run_tests.py	python tests: print exception if nose is unavailable	2013-04-05 22:51:53 -07:00