Antonio Zugaldia 7e30025abb Merge remote-tracking branch 'mapbox/master' into 2317-espresso ...

Conflicts:
	src/mbgl/util/geojsonvt

2015-09-15 17:58:36 -04:00

..

cpp

#894 - Wiring up getTopOffsetPixelsForAnnotationSymbol in JNI

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

java

Merge remote-tracking branch 'mapbox/master' into 2317-espresso

2015-09-15 17:58:36 -04:00

mapboxgl-app.gypi

Use OkHTTP to implement HTTPContext on Android.

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