artemp 29423cfc1c Merge branch 'master' into conv_simplify
Conflicts:
	bindings/python/mapnik_markers_symbolizer.cpp
	plugins/input/ogr/ogr_index_featureset.cpp
	plugins/input/shape/dbfile.cpp
	plugins/input/shape/shapefile.hpp
	src/load_map.cpp
2012-09-07 16:46:02 +01:00
..
2012-08-27 16:43:40 -07:00
2012-04-08 02:20:56 +02:00
2012-04-08 02:20:56 +02:00
2011-11-13 19:54:32 -08:00
2012-04-08 02:20:56 +02:00
2012-04-08 02:20:56 +02:00
2012-08-08 16:15:54 +01:00
2012-08-24 13:49:28 -07:00
2012-09-03 10:27:48 -07:00
2012-08-24 13:49:28 -07:00
2012-04-08 02:20:56 +02:00
2012-04-08 02:20:56 +02:00