Leith Bade 74e953cc48 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-conversions ...

Conflicts:
	android/java/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxgl/testapp/MainActivity.java

2015-02-24 17:16:52 -08:00

..

cpp

Fixup LatLng class ref

2015-02-19 14:28:50 -08:00

java

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

2015-02-24 17:16:52 -08:00

scripts

Move to mapbox bucket

2015-02-13 23:07:45 -08: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.gyp

#826 - Updating copy destinations

2015-02-10 12:42:14 -08:00