Dane Springmeyer
|
f998b2bda6
|
Merge branch '2.3.x' of github.com:mapnik/mapnik
Conflicts:
deps/agg/build.py
deps/clipper/build.py
include/mapnik/feature_style_processor_impl.hpp
plugins/input/csv/csv_datasource.cpp
|
2013-11-03 23:10:21 -08:00 |
|
Dane Springmeyer
|
a656a7af25
|
tests: fix clipping test on windows by stripping newlines
|
2013-11-03 15:23:01 -08:00 |
|
Dane Springmeyer
|
c34c8a568f
|
merge with branch 2.3.x
|
2013-09-30 13:33:28 -07:00 |
|
Dane Springmeyer
|
a2f24e72bd
|
iwyu
|
2013-09-27 11:52:40 -07:00 |
|
Dane Springmeyer
|
5d12a345ae
|
start using c++11 features: auto/for/unique_ptr/variadic args - refs #1972
|
2013-09-19 20:19:01 -07:00 |
|
Dane Springmeyer
|
3b2bdba7b0
|
iwyu
|
2013-06-02 20:19:33 -07:00 |
|
Dane Springmeyer
|
a41c2205d5
|
more cpp test cleanup
|
2013-05-25 18:16:18 -07:00 |
|
Dane Springmeyer
|
4bd63ce7a0
|
iwyu and fix compile on linux
|
2013-05-25 16:04:40 -07:00 |
|
Dane Springmeyer
|
1211211f98
|
quiet mode for c++ tests
|
2013-05-24 17:21:55 -07:00 |
|
Dane Springmeyer
|
11e825a045
|
formatting
|
2013-03-14 18:33:59 -07:00 |
|
Dane Springmeyer
|
96c65979a1
|
first pass at a lower level set of clipping tests that avoid complexity of wkt and vertex converters - refs #1699
|
2013-03-07 13:31:32 -08:00 |
|