diff options
| author | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-05-17 11:47:31 -0400 |
|---|---|---|
| committer | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-05-17 11:47:31 -0400 |
| commit | 30376f3ce1d17522d9e64901b1bbc52906ee5267 (patch) | |
| tree | 1f00d04a223a76a86e16ddebc77f56d2cff88b5b /cmake/core-files.cmake | |
| parent | 7d1e52a3255d4eecdcd37e4fb600eb76fa9333f8 (diff) | |
| parent | 146057adf90e85e3edc80446f02d20e5f6cab378 (diff) | |
| download | qtlocation-mapboxgl-upstream/fabian-merge-release-4.0.1-master.tar.gz | |
Merge branch 'release-boba' into masterupstream/fabian-merge-release-4.0.1-master
# Conflicts:
# mapbox-gl-js
# platform/android/CHANGELOG.md
# platform/android/MapboxGLAndroidSDK/gradle.properties
# platform/android/gradle/dependencies.gradle
# platform/darwin/src/MGLVectorTileSource.mm
# platform/darwin/src/MGLVectorTileSource_Private.h
# platform/ios/CHANGELOG.md
# src/mbgl/style/expression/compound_expression.cpp
Diffstat (limited to 'cmake/core-files.cmake')
| -rw-r--r-- | cmake/core-files.cmake | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index 0474de4680..7e48b336b4 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -360,7 +360,6 @@ set(MBGL_CORE_FILES include/mbgl/style/conversion.hpp include/mbgl/style/data_driven_property_value.hpp include/mbgl/style/filter.hpp - include/mbgl/style/filter_evaluator.hpp include/mbgl/style/heatmap_color_property_value.hpp include/mbgl/style/image.hpp include/mbgl/style/layer.hpp @@ -377,7 +376,6 @@ set(MBGL_CORE_FILES src/mbgl/style/custom_tile_loader.cpp src/mbgl/style/custom_tile_loader.hpp src/mbgl/style/filter.cpp - src/mbgl/style/filter_evaluator.cpp src/mbgl/style/image.cpp src/mbgl/style/image_impl.cpp src/mbgl/style/image_impl.hpp |