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] Add iosapp Settings.app force touch quick action shortcut

2017-08-02 18:46:13 -04:00

Base.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05: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

hu.lproj

[ios] Added Hungarian localization from Transifex

2017-06-22 12:24:42 -07: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

ru.lproj

[ios, macos] Enable localizations in iosapp & macosapp

2017-02-20 23:07:05 -05: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

fill_filter_style.json

[ios, android] add visual tests for fill, line, & numeric filter styling (#6433)

2016-09-23 10:13:11 -07:00

Info.plist

[ios] Add iosapp Settings.app force touch quick action shortcut

2017-08-02 18:46:13 -04:00

LaunchScreen.storyboard

[ios] Clean-up iosapp project

2017-08-02 18:48:11 -04:00

line_filter_style.json

[ios, android] add visual tests for fill, line, & numeric filter styling (#6433)

2016-09-23 10:13:11 -07:00

main.m

[ios, osx] Consolidate remaining files in platform/{ios,osx}

2016-02-12 14:53:52 -08:00

Main.storyboard

[ios] Match gesture recognizer with map view user interaction state

2017-04-11 07:33:22 -07:00

MBXAnnotationView.h

[ios] Simplified MBXAnnotationView

2016-07-02 21:00:48 -07:00

MBXAnnotationView.m

[ios] added check for annotation view animation (#8565)

2017-04-12 11:30:28 -07:00

MBXAppDelegate.h

[core] code style cleanups

2016-07-01 12:38:33 +02:00

MBXAppDelegate.m

[ios] Add iosapp Settings.app force touch quick action shortcut

2017-08-02 18:46:13 -04:00

MBXCustomCalloutView.h

[ios] Optional positioning and stickiness for callout view

2017-01-11 15:48:08 -08:00

MBXCustomCalloutView.m

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

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

MBXEmbeddedMapViewController.h

[ios] Match gesture recognizer with map view user interaction state

2017-04-11 07:33:22 -07:00

MBXEmbeddedMapViewController.m

[ios] Match gesture recognizer with map view user interaction state

2017-04-11 07:33:22 -07:00

MBXOfflinePacksTableViewController.h

[ios] Renamed downloads to offline packs in iosapp

2016-03-10 17:14:14 -08:00

MBXOfflinePacksTableViewController.m

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

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

MBXUserLocationAnnotationView.h

[ios] Refactored user location annotation into a customizable class (#5882)

2016-08-16 15:16:59 -04:00

MBXUserLocationAnnotationView.m

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

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

MBXViewController.h

[ios, osx] Consolidate remaining files in platform/{ios,osx}

2016-02-12 14:53:52 -08:00

MBXViewController.m

Merge tag 'ios-v3.6.2' into master

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

numeric_filter_style.json

[ios, android] add visual tests for fill, line, & numeric filter styling (#6433)

2016-09-23 10:13:11 -07:00

points.geojson

[ios, osx] Consolidate remaining files in platform/{ios,osx}

2016-02-12 14:53:52 -08:00

polyline.geojson

[ios, osx] Consolidate remaining files in platform/{ios,osx}

2016-02-12 14:53:52 -08:00

threestates.geojson

[ios, osx] Consolidate remaining files in platform/{ios,osx}

2016-02-12 14:53:52 -08:00