Merge remote-tracking branch 'mapbox/master' into 2317-espresso

Conflicts:
	src/mbgl/util/geojsonvt
This commit is contained in:
Antonio Zugaldia
2015-09-15 17:58:36 -04:00
parent 187cc36eb5
commit 7e30025abb
26 changed files with 238 additions and 42 deletions

View File

@@ -1,10 +1,11 @@
#include <mapbox/geojsonvt/geojsonvt_convert.hpp>
#include <mbgl/map/annotation.hpp>
#include <mbgl/annotation/point_annotation.hpp>
#include <mbgl/annotation/shape_annotation.hpp>
#include <mbgl/map/tile_id.hpp>
#include <mbgl/map/live_tile.hpp>
#include <mbgl/util/constants.hpp>
#include <mbgl/util/geojsonvt/geojsonvt_convert.hpp>
#include <mbgl/util/ptr.hpp>
#include <mbgl/util/string.hpp>