Fabian Guerra 187b6dc31c Merge branch 'release-agua' into master ...

# Conflicts:
#	circle.yml
#	cmake/core-files.cmake
#	platform/android/CHANGELOG.md
#	platform/android/MapboxGLAndroidSDK/build.gradle
#	platform/android/MapboxGLAndroidSDK/gradle.properties
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraChangeDispatcher.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/LocalGlyphRasterizer.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/BitmapUtils.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LocalGlyphActivity.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTintActivity.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_local_glyph.xml
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml
#	platform/darwin/src/MGLMapSnapshotter.mm
#	platform/darwin/src/MGLRendererConfiguration.h
#	platform/ios/CHANGELOG.md
#	platform/ios/DEVELOPING.md
#	platform/ios/INSTALL.md
#	platform/ios/README.md
#	platform/ios/resources/bg.lproj/Localizable.strings
#	platform/ios/resources/es.lproj/Localizable.strings
#	platform/ios/resources/vi.lproj/Localizable.strings
#	platform/ios/src/MGLMapView.mm
#	platform/macos/macos.xcodeproj/project.pbxproj
#	src/mbgl/text/glyph_manager.cpp

2018-01-04 12:55:19 -06:00

..

check-cxx11abi.dat

[Qt] Use C++11 ABI packages

2016-05-10 11:36:56 +03:00

check-cxx11abi.sh

[build] upgrade to v4 CircleCI images that have logbt/mesa/gdb/apitrace installed

2017-07-13 15:11:12 +02:00

check-qt.sh

[build] Autodetect Qt{4,5}

2017-03-23 16:09:07 +02:00

clang-tools.sh

[tests] Bump clang-tidy/format version

2017-07-26 18:51:11 +03:00

codestyle.sh

[core] remove trailing whitespace, add trailing newlines, add space after //

2017-01-27 11:44:16 +01:00

collect-coverage.sh

[build] Re-enable coverage run

2016-08-05 11:42:22 +02:00

config.xcconfig.in

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

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

generate-benchmark-files.sh

[build] Re-add benchmark tests to the buildsystem

2016-10-05 11:12:16 +03:00

generate-core-files.sh

[build] use git ls-files so we only include tracked files

2016-09-28 16:34:22 +02:00

generate-shaders.js

[core] Use separate attribute component for line normals

2017-08-08 18:06:44 -07:00

generate-style-code.js

Replace compile-time polymorphism with runtime polymorphism in the conversion system

2017-10-23 09:56:43 -07:00

generate-test-files.sh

[build] use git ls-files so we only include tracked files

2016-09-28 16:34:22 +02:00

launch-c-xcode.in

[build] make Xcode use the correct compiler when it is installed in a non-standard location

2017-07-18 11:54:14 +02:00

launch-c.in

[build] make Xcode use the correct compiler when it is installed in a non-standard location

2017-07-18 11:54:14 +02:00

launch-cxx-xcode.in

[build] make Xcode use the correct compiler when it is installed in a non-standard location

2017-07-18 11:54:14 +02:00

launch-cxx.in

[build] make Xcode use the correct compiler when it is installed in a non-standard location

2017-07-18 11:54:14 +02:00

lldb-types

[core] add LLDB summaries for types we use commonly

2017-07-12 17:19:03 +02:00

log_binary_size.sh

[build] publish binary size statistics to S3

2016-11-22 17:33:25 +01:00

log_memory_benchmarks.sh

[core] Log Memory.Footprint test results (#8170)

2017-02-28 14:11:35 -08:00

mason.sh

[build] Remove Mason submodule in favor of CMake mason

2017-02-08 19:07:16 +01:00

publish_binary_size.sh

[ios, build] Stop packaging i386 simulator arch

2017-12-20 17:36:06 -08:00

style-code.js

[core] Render fill-extrusion layers (#8431)

2017-04-27 15:56:55 -07:00

update_ca_bundle.sh

[build] Remove unused files, and cleanup directories

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

valgrind.sh

Revert "[build] Add --track-origins=yes to valgrind arguments"

2017-02-20 16:46:52 -08:00

valgrind.sup

[core] Make sure ThreadLocal will not own the pointer it is managing

2017-07-14 15:18:54 +03:00