Artem Pavlenko a72ee4ba66 Merge branch 'master' into compositing ... Conflicts: include/mapnik/image_compositing.hpp include/mapnik/util/conversions.hpp include/mapnik/value.hpp src/agg/agg_renderer.cpp src/agg/process_line_symbolizer.cpp src/agg/process_polygon_symbolizer.cpp src/png_reader.cpp src/svg_parser.cpp utils/svg2png/svg2png.cpp		2012-05-01 12:35:49 +01:00
..
epydoc_config	embed version in the epydoc output	2012-04-09 13:54:33 -07:00
format_source_files	format c++ tests	2012-04-16 22:33:37 -07:00
geometry_to_wkb	whitespace fixes	2012-02-01 17:37:58 -08:00
mapnik-config	move the json config into the main script	2011-12-14 15:51:57 -08:00
ogrindex	switch back from mapnik2 to mapnik	2011-11-23 11:33:58 +00:00
performance	mapnik-speed-check: ensure the bbox arg is set properly	2012-03-09 12:04:37 -08:00
pgsql2sqlite	scons: fixup pgsql2pqlite build by ensuring CXXFLAGS are passed	2012-04-23 12:48:30 -07:00
shapeindex	yet another -fpermissive - refs #1082, #950 and #1001	2012-02-14 12:03:44 -08:00
src_utils	- small script to keep copyright aligned in all files (bindings have different copyright owners, need to understand if we need to keep those as they are)	2011-10-23 15:11:14 +02:00
stats	collect number of unique styles	2008-02-01 15:38:33 +00:00
svg2png	Merge branch 'master' into compositing	2012-05-01 12:35:49 +01:00
upgrade_map_xml	merge textplacement-merge into feature_impl	2012-01-26 13:04:08 +00:00
xml	rename dtd	2012-03-14 15:33:55 -07:00