archive-gh-me/mapnik
1
0
Fork 0
mirror of https://github.com/mapnik/mapnik.git synced 2025-12-08 20:13:09 +00:00
Code Issues Projects Releases Wiki Activity
mapnik/plugins/input
History
Dane Springmeyer a98de6a348 Merge branch 'master' of github.com:mapnik/mapnik into expr-v2 
Conflicts:
	include/mapnik/expression_grammar_impl.hpp
	src/expression.cpp
2014-01-27 13:56:36 -08:00
..
csv
minimum boost version is 1.47 - remove obsolete code handling older versions
2014-01-27 13:19:21 -08:00
gdal
Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
2014-01-17 20:04:09 -08:00
geojson
minimum boost version is 1.47 - remove obsolete code handling older versions
2014-01-27 13:19:21 -08:00
occi
c++11 : use nullptr instead of NULL
2013-11-27 15:54:16 +00:00
ogr
Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
2014-01-27 13:56:36 -08:00
osm
symbolizer-expressions replayed against latest master
2013-11-27 22:50:15 -08:00
postgis
c++11 : use nullptr instead of NULL
2013-11-27 15:54:16 +00:00
python
Merge branch '2.3.x' of github.com:mapnik/mapnik
2013-11-03 23:10:21 -08:00
raster
symbolizer-expressions replayed against latest master
2013-11-27 22:50:15 -08:00
rasterlite
scons: simplify linkflags/ldflags setting / attempt to fix #2025
2013-10-22 16:35:46 -04:00
shape
remove workaround for boost less than 1.46 since 1.47 is now the min needed - refs #1082
2014-01-27 12:24:20 -08:00
sqlite
scons: simplify linkflags/ldflags setting / attempt to fix #2025
2013-10-22 16:35:46 -04:00
templates
scons: simplify linkflags/ldflags setting / attempt to fix #2025
2013-10-22 16:35:46 -04:00
topojson
minimum boost version is 1.47 - remove obsolete code handling older versions
2014-01-27 13:19:21 -08:00