Jordan Hollinger 07dc6e37a2 Merge branch 'expr-v2' of github.com:mapnik/mapnik into expr-v2-group-symbolizer ... Conflicts: include/mapnik/attribute_collector.hpp		2014-02-18 18:22:01 -05:00
..
cpp_tests	Merge pull request #2154 from mapnik/expr-v2-vt-conv-feature	2014-02-10 10:44:19 -08:00
data	Added test for markers compared with points.	2014-01-02 18:51:01 +00:00
python_tests	Python interface for group symbolizer.	2014-02-18 16:38:58 -05:00
visual_tests	Merge branch 'expr-v2' of github.com:mapnik/mapnik into expr-v2-group-symbolizer	2014-02-18 18:22:01 -05:00
run_tests.py	python tests: print exception if nose is unavailable	2013-04-05 22:51:53 -07:00