Fabian Guerra acfe485302 Merge tag 'ios-v3.6.2' into master ...

# Conflicts:
#	cmake/core-files.cmake
#	include/mbgl/renderer/renderer_backend.hpp
#	platform/android/CHANGELOG.md
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/IconManager.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/dependencies.gradle
#	platform/darwin/src/MGLStyle.mm
#	platform/ios/CHANGELOG.md
#	platform/ios/app/Info.plist
#	platform/ios/app/MBXViewController.m
#	platform/ios/ios.xcodeproj/project.pbxproj
#	platform/macos/CHANGELOG.md
#	src/mbgl/gl/attribute.cpp
#	src/mbgl/gl/attribute.hpp
#	src/mbgl/gl/context.hpp
#	src/mbgl/gl/types.hpp
#	src/mbgl/gl/value.cpp
#	src/mbgl/gl/value.hpp
#	src/mbgl/map/backend_scope.cpp
#	src/mbgl/programs/attributes.hpp
#	src/mbgl/programs/program.hpp
#	src/mbgl/programs/segment.cpp
#	src/mbgl/programs/segment.hpp
#	src/mbgl/programs/symbol_program.hpp
#	src/mbgl/programs/uniforms.hpp
#	src/mbgl/renderer/buckets/symbol_bucket.hpp
#	src/mbgl/renderer/painter.cpp
#	src/mbgl/renderer/painter.hpp
#	src/mbgl/renderer/painter_background.cpp
#	src/mbgl/renderer/painter_circle.cpp
#	src/mbgl/renderer/painter_clipping.cpp
#	src/mbgl/renderer/painter_debug.cpp
#	src/mbgl/renderer/painter_fill.cpp
#	src/mbgl/renderer/painter_fill_extrusion.cpp
#	src/mbgl/renderer/painter_line.cpp
#	src/mbgl/renderer/painter_raster.cpp
#	src/mbgl/renderer/painter_symbol.cpp
#	src/mbgl/shaders/line.cpp
#	src/mbgl/shaders/line_pattern.cpp
#	test/renderer/backend_scope.test.cpp

2017-08-28 12:43:29 -04:00

..

Assets.xcassets

[iOS][macOS] Add ImageSource bindings

2017-06-19 09:50:08 -07:00

Base.lproj

[iOS][macOS] Add ImageSource bindings

2017-06-19 09:50:08 -07:00

ca.lproj

[ios, macos] Russian, Catalan, Lithuanian, Finnish, Dutch (#8256)

2017-03-08 02:43:33 -08:00

de.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

es.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

fi.lproj

[ios, macos] Russian, Catalan, Lithuanian, Finnish, Dutch (#8256)

2017-03-08 02:43:33 -08:00

fr.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

ja.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

lt.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

nl.lproj

[ios, macos] Russian, Catalan, Lithuanian, Finnish, Dutch (#8256)

2017-03-08 02:43:33 -08:00

pl.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

pt-BR.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

resources

[macos] Added Layers sidebar

2016-11-28 15:45:43 -08:00

ru.lproj

[ios, macos] Russian, Catalan, Lithuanian, Finnish, Dutch (#8256)

2017-03-08 02:43:33 -08:00

sv.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

uk.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

vi.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

zh-Hans.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

zh-Hant.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05:00

AppDelegate.h

[macos] Renamed OS X SDK to macOS SDK

2016-06-14 10:02:06 +02:00

AppDelegate.m

Merge branch 'release-ios-v3.4.0' into 1ec5-release-ios-v3.4.2

2017-02-21 22:47:15 -08:00

Credits.rtf

[macos] Renamed OS X SDK to macOS SDK

2016-06-14 10:02:06 +02:00

DroppedPinAnnotation.h

[macos] Renamed OS X SDK to macOS SDK

2016-06-14 10:02:06 +02:00

DroppedPinAnnotation.m

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

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

Info.plist

[macos] allow using the integrated GPU on dual-GPU machines

2017-01-26 08:01:03 -08:00

LimeGreenStyleLayer.h

[ios, macos] Migrate MGLCustomStyleLayerAdditions to style layer API (#7250)

2016-12-07 00:01:11 -08:00

LimeGreenStyleLayer.m

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

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

LocationCoordinate2DTransformer.h

[macos] Renamed OS X SDK to macOS SDK

2016-06-14 10:02:06 +02:00

LocationCoordinate2DTransformer.m

[macos] Renamed OS X SDK to macOS SDK

2016-06-14 10:02:06 +02:00

main.m

[macos] Renamed OS X SDK to macOS SDK

2016-06-14 10:02:06 +02:00

MapDocument.h

[macos] Avoid first responder action name conflict

2016-11-28 15:45:43 -08:00

MapDocument.m

Merge tag 'ios-v3.6.2' into master

2017-08-28 12:43:29 -04:00

MGLStyle+MBXAdditions.h

[macos] Arrange layers top to bottom in sidebar

2017-01-06 07:47:43 -08:00

MGLStyle+MBXAdditions.m

[macos] Arrange layers top to bottom in sidebar

2017-01-06 07:47:43 -08:00

OfflinePackNameValueTransformer.h

[macos] Renamed OS X SDK to macOS SDK

2016-06-14 10:02:06 +02:00

OfflinePackNameValueTransformer.m

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

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

StyleLayerIconTransformer.h

[macos] Added Layers sidebar

2016-11-28 15:45:43 -08:00

StyleLayerIconTransformer.m

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

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

TimeIntervalTransformer.h

[macos] Renamed OS X SDK to macOS SDK

2016-06-14 10:02:06 +02:00

TimeIntervalTransformer.m

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

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

wms.json

Quadkey tokens in tile URL templates, limited WMS support (#5628)

2016-07-12 10:57:18 -07:00