Fabian Guerra da7759a273 Merge branch 'release-agua' into master ...

# Conflicts:
#	include/mbgl/style/conversion/layer.hpp
#	platform/android/MapboxGLAndroidSDK/build.gradle
#	platform/android/MapboxGLAndroidSDK/gradle.properties
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineRegion.java

2018-01-25 14:39:18 -05:00

..

android

Merge branch 'release-agua' into master

2018-01-25 14:39:18 -05:00

darwin

Merge branch 'release-agua' into master

2018-01-25 14:39:18 -05:00

default

[core] add raster-dem source type and hillshade layer type (#10642)

2018-01-23 10:49:23 -08:00

glfw

[glfw] add animated annotations to glfw app for debugging

2018-01-11 14:07:00 -05:00

ios

[ios, macos] Hook up hillshade style layers, raster DEM sources to iOS/macOS (#11036)

2018-01-25 10:46:27 -08:00

linux

[build] Remove unused files, and cleanup directories

2018-01-03 01:07:41 +01:00

macos

[ios, macos] Hook up hillshade style layers, raster DEM sources to iOS/macOS (#11036)

2018-01-25 10:46:27 -08:00

node

[node] add setLight support

2018-01-24 16:35:47 -08:00

qt

[qt][build] Use ninja for compiling Qt for Windows

2018-01-10 21:42:20 +02:00