Merge remote-tracking branch 'mapbox/master' into 2317-espresso
Conflicts: src/mbgl/util/geojsonvt
This commit is contained in:
@@ -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>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user