Brad Leege d67b88dba9 Merge branch 'release-android-v4.1.0' ...

# Conflicts:
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/BaseMarkerViewOptions.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerView.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/annotations/MarkerViewManager.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java
#	platform/android/src/jni.cpp
#	src/mbgl/geometry/buffer.hpp
#	src/mbgl/geometry/glyph_atlas.cpp
#	src/mbgl/geometry/glyph_atlas.hpp
#	src/mbgl/geometry/line_atlas.cpp
#	src/mbgl/geometry/vao.cpp
#	src/mbgl/gl/gl_object_store.cpp
#	src/mbgl/gl/gl_object_store.hpp
#	src/mbgl/renderer/frame_history.cpp
#	src/mbgl/shader/shader.cpp
#	src/mbgl/sprite/sprite_atlas.cpp
#	src/mbgl/sprite/sprite_atlas.hpp
#	src/mbgl/text/glyph_pbf.hpp

2016-06-09 14:00:49 -05:00

..

default_file_source.hpp

[core] use #pragma once instead of ifdef include guards

2016-05-25 21:35:37 +02:00

file_source.hpp

[core] use #pragma once instead of ifdef include guards

2016-05-25 21:35:37 +02:00

network_status.hpp

[android] #5254 - fix ARMv5 support

2016-06-06 23:31:51 +03:00

offline.hpp

[core] Rationalize naming for style-related code

2016-06-02 14:51:39 -07:00

online_file_source.hpp

[core] use #pragma once instead of ifdef include guards

2016-05-25 21:35:37 +02:00

resource.hpp

[core] Rationalize naming for style-related code

2016-06-02 14:51:39 -07:00

response.hpp

[core] use #pragma once instead of ifdef include guards

2016-05-25 21:35:37 +02:00