Fabian Guerra 42bcb4b405 Merge branch 'release-agua' into master ...

# Conflicts:
#	platform/android/CHANGELOG.md
#	platform/android/MapboxGLAndroidSDK/gradle.properties
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
#	platform/ios/CHANGELOG.md
#	platform/ios/ios.xcodeproj/project.pbxproj
#	platform/macos/CHANGELOG.md

2018-01-17 09:41:37 -05:00

..

android

Merge branch 'release-agua' into master

2018-01-17 09:41:37 -05:00

darwin

[core, ios, macos, android] Add data-driven-styling support for text-font

2018-01-10 15:31:12 -08:00

default

[windows][core] Define S_ISDIR when not defined

2018-01-08 22:58:20 +02:00

glfw

[glfw] add animated annotations to glfw app for debugging

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

ios

Merge branch 'release-agua' into master

2018-01-17 09:41:37 -05:00

linux

[build] Remove unused files, and cleanup directories

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

macos

Merge branch 'release-agua' into master

2018-01-17 09:41:37 -05:00

node

[core] Remove two obsolete ignores

2018-01-11 12:25:26 -08:00

qt

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

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