Brad Leege b45b42590f Merge branch 'master' of github.com:mapbox/mapbox-gl-native ...

# Conflicts:
#	android/java/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxgl/views/MapView.java

2015-09-09 15:08:49 -05:00

..

src/main

Merge branch 'master' of github.com:mapbox/mapbox-gl-native

2015-09-09 15:08:49 -05:00

build.gradle

#894 - Updating Android Support Libraries to 23.0.1

2015-09-07 12:05:24 -07:00

deploy.sh

#826 - Adding make command to build GL core, assemble .aar, and publish to Maven Central

2015-02-11 13:44:07 -08:00

gradle.properties

#934 - Setting SDK Minimum to API 15. Removing TargetApi Annotations.

2015-08-21 15:46:16 -05:00

lint.xml

Ignore lint error from OkHTTP

2015-02-26 10:25:36 -08:00

proguard-rules.pro

Added proguard config for SDK

2015-08-31 10:30:08 +02:00