Fabian Guerra e08b6fe87f Merge branch 'release-boba' into master ...

# Conflicts:
#	circle.yml
#	include/mbgl/style/expression/let.hpp
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngBounds.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapKeyListener.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Projection.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
#	platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngBoundsTest.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
#	platform/android/gradle/dependencies.gradle
#	platform/android/src/example_custom_layer.cpp
#	platform/android/src/geojson/point.cpp
#	platform/darwin/src/NSPredicate+MGLAdditions.mm
#	platform/darwin/test/MGLExpressionTests.mm
#	platform/ios/Mapbox-iOS-SDK-nightly-dynamic.podspec
#	platform/ios/Mapbox-iOS-SDK-symbols.podspec
#	platform/ios/Mapbox-iOS-SDK.podspec
#	platform/ios/app/MBXViewController.m
#	src/mbgl/renderer/layers/render_custom_layer.cpp
#	src/mbgl/style/conversion/filter.cpp
#	src/mbgl/style/expression/interpolate.cpp
#	src/mbgl/style/expression/value.cpp
#	test/style/filter.test.cpp

2018-04-23 10:44:02 -04:00

..

mbgl

Merge branch 'release-boba' into master

2018-04-23 10:44:02 -04:00

resources

[ios, macos] Fix size and color of default marker image

2017-06-26 14:56:21 -04:00

asset_file_source.cpp

[core] align implementations of local and asset file source

2018-01-25 13:45:47 -08:00

async_task.cpp

[tidy] modernize-use-auto

2017-05-12 18:07:36 +03:00

bidi.cpp

[tidy] modernize-use-nullptr

2017-05-12 18:07:36 +03:00

default_file_source.cpp

[core] align implementations of local and asset file source

2018-01-25 13:45:47 -08:00

file_source_request.cpp

[build] split out DefaultFileSource and dependents to a separate target

2017-09-28 13:48:36 -04:00

headless_backend_osmesa.cpp

[core] move HeadlessBackend extension initialization code into Impl

2017-11-29 15:48:51 +01:00

http_file_source.cpp

[core] finish must-revalidate support

2017-08-08 12:40:38 +02:00

image.cpp

[tidy] modernize-use-auto

2017-05-12 18:07:36 +03:00

jpeg_reader.cpp

[tidy] modernize-use-auto

2017-05-12 18:07:36 +03:00

local_file_source.cpp

[core] align implementations of local and asset file source

2018-01-25 13:45:47 -08:00

local_glyph_rasterizer.cpp

[ios,macos] Darwin implementation of a CoreText-based LocalGlyphRasterizer.

2017-12-11 10:43:00 -08:00

logging_stderr.cpp

[build] move logging to util

2016-11-22 20:58:51 +01:00

online_file_source.cpp

[test] add ability to take the OnlineFileSource offline

2017-09-22 10:57:15 +02:00

png_reader.cpp

[tidy] modernize-use-auto

2017-05-12 18:07:36 +03:00

png_writer.cpp

[macos,ios] don't roundtrip through encodePNG when converting images

2017-01-26 15:26:55 +01:00

run_loop.cpp

[core] factor out RunLoop::wake()

2018-02-06 18:49:06 +01:00

sqlite3.cpp

[core, qt] move self-resetting Statement/Query object to shared header

2018-03-02 14:26:25 +01:00

sqlite3.hpp

[core, qt] move self-resetting Statement/Query object to shared header

2018-03-02 14:26:25 +01:00

string_stdlib.cpp

[build] move logging to util

2016-11-22 20:58:51 +01:00

thread_local.cpp

[core] current scheduler

2017-08-09 12:08:21 +03:00

thread.cpp

[build] move logging to util

2016-11-22 20:58:51 +01:00

timer.cpp

[tidy] modernize-use-auto

2017-05-12 18:07:36 +03:00

utf.cpp

[core] GCC 4.9 does not provide <codecvt>

2017-07-12 20:42:29 +03:00

webp_reader.cpp

[build] move logging to util

2016-11-22 20:58:51 +01:00