Konstantin Käfer ae865a59fb Merge branch 'master' into conv_simplify
Conflicts:
	include/mapnik/vertex_converters.hpp
2012-08-28 20:37:27 +02: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
2012-07-24 19:08:15 -07: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-04-08 02:20:56 +02: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