Konstantin Käfer 4e1423cefe Merge branch 'master' of git://github.com/mapnik/mapnik into conv_simplify ... Conflicts: src/cairo_renderer.cpp		2012-08-24 23:24:31 +02:00
..
mapnik	Merge branch 'master' of git://github.com/mapnik/mapnik into conv_simplify	2012-08-24 23:24:31 +02:00