Brad Leege 93940864ec Merge branch 'master' into 2244-texture-view ...

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

2015-09-09 14:59:42 -05:00

..

gradle/wrapper

Applying suggestion from Android studio to use Gradle URL with source code to enable in IDE documentation for Gradle files

2015-08-07 10:14:39 +10:00

MapboxGLAndroidSDK

Merge branch 'master' into 2244-texture-view

2015-09-09 14:59:42 -05:00

MapboxGLAndroidSDKTestApp

#2283 - Supporting custom InfoWindow touch listeners via Marker.setInfoWindowOnTouchListener(). Added Test to Custom Annotations in TestApp's MainActivity.

2015-09-08 14:46:18 -05:00

.gitignore

#1668 - Adding fabric.properties to .gitignore

2015-07-22 13:19:06 -05:00

build.gradle

#1982 - Updating to 2.5

2015-08-03 17:05:46 -05:00

checks.xml

#826 -Adding checkstyle to TestApp build process.

2015-02-09 17:51:46 -08:00

gradlew

Add java files

2014-11-06 00:04:48 +11:00

gradlew.bat

Add java files

2014-11-06 00:04:48 +11:00

settings.gradle

#826 - Reordering modules

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