Brad Leege 72aaf3934a Merge branch 'master' into 1856-material-take-2 ...

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

2015-08-12 18:22:17 -05:00

..

cpp

Use OkHTTP to implement HTTPContext on Android.

2015-08-11 11:59:08 +10:00

java

Merge branch 'master' into 1856-material-take-2

2015-08-12 18:22:17 -05:00

LICENSE_COMMONS.txt

Fix build

2014-11-28 00:17:14 +11:00

LICENSE_GESTURES.md

Add missing gesture detection library licence

2014-11-16 18:29:22 +11:00

LICENSE_LOST.txt

Use LOST for GPS

2015-01-21 12:06:11 +11:00

mapboxgl-app.gypi

Use OkHTTP to implement HTTPContext on Android.

2015-08-11 11:59:08 +10:00