Dane Springmeyer
9e9747ffad
Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
Conflicts:
src/agg/process_building_symbolizer.cpp
src/cairo_context.cpp
src/cairo_renderer.cpp
src/grid/process_building_symbolizer.cpp
src/grid/process_line_pattern_symbolizer.cpp
src/grid/process_text_symbolizer.cpp
tests/python_tests/images/support/marker-text-line-scale-factor-0.899.png
tests/python_tests/images/support/marker-text-line-scale-factor-1.5.png
tests/python_tests/images/support/marker-text-line-scale-factor-1.png
tests/python_tests/images/support/marker-text-line-scale-factor-10.png
tests/python_tests/images/support/marker-text-line-scale-factor-100.png
tests/python_tests/images/support/marker-text-line-scale-factor-2.png
tests/python_tests/images/support/marker-text-line-scale-factor-5.png
tests/visual_tests/images/lines-5-200-200-1.0-agg-reference.png
tests/visual_tests/images/lines-5-200-200-2.0-agg-reference.png
tests/visual_tests/images/lines-5-400-400-1.0-agg-reference.png
tests/visual_tests/images/lines-5-400-400-2.0-agg-reference.png
tests/visual_tests/images/lines-5-600-600-1.0-agg-reference.png
tests/visual_tests/images/lines-5-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-5-800-800-1.0-agg-reference.png
tests/visual_tests/images/lines-5-800-800-2.0-agg-reference.png
tests/visual_tests/images/lines-6-200-200-2.0-agg-reference.png
tests/visual_tests/images/lines-6-400-400-2.0-agg-reference.png
tests/visual_tests/images/lines-6-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-6-800-800-2.0-agg-reference.png
tests/visual_tests/test.py
2014-04-24 21:44:28 -07:00
..
2014-04-24 21:44:28 -07:00
2009-04-16 17:22:38 +00:00
2013-10-02 09:41:05 -07:00
2013-06-02 19:28:24 -07:00
2013-07-23 19:37:25 -04:00
2013-10-28 14:18:44 -07:00
2014-01-27 16:28:34 -08:00
2013-10-30 11:57:03 -07:00
2013-06-13 13:34:34 -07:00
2013-06-02 19:28:24 -07:00
2013-06-02 19:28:24 -07:00
2013-06-03 15:13:12 -07:00
2013-09-18 16:08:34 -07:00
2013-07-10 22:36:38 +01:00
2013-06-02 19:28:24 -07:00
2013-06-02 19:28:24 -07:00
2013-06-13 13:34:34 -07:00
2013-11-21 14:11:47 -08:00
2013-06-02 19:28:24 -07:00
2013-06-02 19:28:24 -07:00
2014-01-27 16:28:34 -08:00
2013-09-18 19:55:02 -07:00
2013-06-02 19:28:24 -07:00
2013-06-02 19:28:24 -07:00
2013-11-22 16:41:46 -08:00
2013-06-02 19:28:24 -07:00
2013-06-02 19:28:24 -07:00
2013-12-02 21:51:24 -08:00
2013-07-11 18:32:54 +01:00
2013-06-02 19:28:24 -07:00
2013-06-02 19:28:24 -07:00
2014-01-27 14:24:22 -08:00
2013-06-02 19:28:24 -07:00
2013-06-02 19:28:24 -07:00
2014-02-18 16:38:58 -05:00
2013-06-03 15:02:43 -07:00
2013-06-13 13:34:34 -07:00
2013-06-03 15:02:43 -07:00
2013-06-02 19:28:24 -07:00
2013-06-02 19:28:24 -07:00
2013-06-03 15:02:43 -07:00
2013-11-22 16:41:46 -08:00
2013-06-02 19:28:24 -07:00
2014-04-09 19:40:14 -04:00
2013-01-28 15:27:00 -05:00
2013-11-22 16:41:46 -08:00
2013-06-02 19:28:24 -07:00
2013-06-02 19:28:24 -07:00
2013-09-25 14:08:47 -07:00
2013-09-25 14:08:47 -07:00
2013-07-23 19:37:25 -04:00
2014-01-27 14:21:07 -08:00
2014-04-01 17:34:24 -07:00
2014-04-24 21:44:28 -07:00
2013-06-02 19:28:24 -07:00
2013-06-02 19:28:24 -07:00
2013-06-03 14:15:27 -07:00
2014-02-27 11:17:09 -08:00
2013-10-29 00:37:41 -07:00
2013-06-02 13:41:14 -07:00
2013-10-04 14:07:38 -07:00