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
..
2012-01-29 05:11:59 +01:00
2012-01-27 23:15:12 +01:00
2012-01-27 23:15:12 +01:00
2012-01-27 23:15:12 +01:00
2012-01-27 23:15:12 +01:00
2012-01-27 23:15:12 +01:00
2012-01-27 23:15:12 +01:00
2012-01-27 23:15:12 +01:00
2012-01-27 23:15:12 +01:00
2012-01-27 23:15:12 +01:00
2012-01-27 23:15:12 +01:00
2012-01-26 13:04:08 +00:00
2012-01-26 13:04:08 +00:00
2012-01-26 13:04:08 +00:00
2012-01-26 13:04:08 +00:00
2012-01-26 13:04:08 +00:00
2012-01-26 13:04:08 +00:00
2012-01-26 13:04:08 +00:00
2012-01-26 13:04:08 +00:00
2012-01-26 13:04:08 +00:00
2012-01-26 13:04:08 +00:00
2012-01-26 13:04:08 +00:00
2012-01-26 13:04:08 +00:00
2012-01-29 05:11:59 +01:00
2012-01-29 05:11:59 +01:00
2012-01-26 13:04:08 +00:00
2012-01-26 13:04:08 +00:00
2012-01-26 13:04:08 +00:00
2012-01-26 13:04:08 +00:00
2012-01-26 13:04:08 +00:00
2012-01-26 13:04:08 +00:00
2012-01-26 13:04:08 +00:00
2012-01-26 13:04:08 +00:00
2012-01-26 13:04:08 +00:00
2012-01-26 13:04:08 +00:00
2012-01-26 13:04:08 +00:00
2012-01-26 13:04:08 +00:00
2012-01-26 13:04:08 +00:00
2012-01-26 13:04:08 +00:00
2012-01-26 13:04:08 +00:00
2012-01-26 13:04:08 +00:00
2012-01-26 13:04:08 +00:00
2012-01-26 13:04:08 +00:00
2012-01-26 13:04:08 +00:00
2012-01-26 13:04:08 +00:00
2012-01-26 13:04:08 +00:00
2012-01-26 13:04:08 +00:00
2012-01-26 13:04:08 +00:00
2012-01-26 13:04:08 +00:00
2012-01-26 13:04:08 +00:00
2012-01-29 05:11:59 +01:00
