Jason Wray e67f0be813 Merge tag 'ios-v4.0.2' into master ...

Conflicts:
	mapbox-gl-js
	platform/android/CHANGELOG.md
	platform/android/gradle/dependencies.gradle
	platform/ios/CHANGELOG.md
	platform/ios/Mapbox-iOS-SDK-nightly-dynamic.podspec
	platform/ios/Mapbox-iOS-SDK-symbols.podspec
	platform/ios/Mapbox-iOS-SDK.podspec
	platform/node/test/ignores.json
	src/mbgl/geometry/feature_index.cpp
	src/mbgl/geometry/feature_index.hpp
	src/mbgl/layout/symbol_layout.cpp

2018-05-30 13:01:04 -04:00

..

android

[android] - fix literal wrapping in comparission expressions

2018-05-29 15:53:38 +02:00

darwin

[ios, macos] Added macro to handle pending iOS tests (rather than disabling via scheme) (#11806)

2018-05-24 00:43:29 -04:00

default

Style JSON configuration on map snapshotter (#11976)

2018-05-23 10:52:22 +02:00

glfw

[core] Convert "legacy" filters directly into expressions (#11610)

2018-05-10 12:37:14 -07:00

ios

Merge tag 'ios-v4.0.2' into master

2018-05-30 13:01:04 -04:00

linux

[linux] Don't compile linux mbgl-loop-uv against node headers

2018-05-04 07:19:36 -07:00

macos

[ios, macos] Fix keypath expressions, json object is parsed incorrectly for nested keypaths. (#11959)

2018-05-23 13:21:31 -04:00

node

[node] fixup bad merge

2018-05-22 12:19:40 +02:00

qt

[build] Use Qt 5.6.3 instead of 5.7 in AppVeyor

2018-05-18 18:00:21 +02:00