artemp 22a1df8388 Merge branch 'master' into image-readers-c++11 ... Conflicts: include/mapnik/factory.hpp		2013-04-18 09:48:31 +01:00
..
cpp_tests	Merge branch 'master' into image-readers-c++11	2013-04-18 09:48:31 +01:00
data	add missing test file	2013-04-09 19:12:27 -07:00
python_tests	fix handling of null values for feature id in sqlite/postgis input - closes #1817	2013-04-17 15:34:21 -07:00
visual_tests	fix visual test reporting to show test that could not be run rather than just 0	2013-04-17 15:33:31 -07:00
run_tests.py	python tests: print exception if nose is unavailable	2013-04-05 22:51:53 -07:00