Artem Pavlenko b90de4874c Merge branch 'textplacement-merge' into feature-text-merge ... Conflicts: docs/textrendering.gv include/mapnik/building_symbolizer.hpp include/mapnik/placement_finder.hpp include/mapnik/symbolizer_helpers.hpp include/mapnik/text_placements.hpp include/mapnik/text_placements_list.hpp include/mapnik/text_placements_simple.hpp include/mapnik/text_processing.hpp plugins/input/shape/shape_utils.hpp src/agg/process_shield_symbolizer.cpp src/agg/process_text_symbolizer.cpp src/cairo_renderer.cpp src/grid/process_shield_symbolizer.cpp src/grid/process_text_symbolizer.cpp src/load_map.cpp src/placement_finder.cpp src/shield_symbolizer.cpp src/text_placements.cpp src/text_processing.cpp src/text_symbolizer.cpp tests/visual_tests/clean.sh tests/visual_tests/test.py Merge herm/textplacement-merge		2012-01-31 11:09:55 +00:00
..
epydoc_config	catch a few more mapnik2 references	2011-11-23 20:35:43 -08:00
format_source_files	catch more directories in the formatting script	2011-11-13 19:39:43 -08:00
geometry_to_wkb	output all attributes	2011-12-02 17:18:28 +00: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	tweak the mapnik-speed-check script to allow being customized to test load times	2011-10-28 15:13:52 -07:00
pgsql2sqlite	update pdsql2sqlite to new feature_impl	2012-01-23 08:40:16 +00:00
shapeindex	code formatting	2011-11-13 19:54:32 -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	switch back from mapnik2 to mapnik	2011-11-23 11:33:58 +00:00
upgrade_map_xml	merge textplacement-merge into feature_impl	2012-01-26 13:04:08 +00:00
xml	Remove no-text attribute. One can simply leave the text empty if one wants this.	2012-01-29 13:10:14 +01:00