tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	src/mbgl/util/geojsonvt
This commit is contained in:
Antonio Zugaldia
2015-09-15 17:58:36 -04:00
parent 187cc36eb5
commit 7e30025abb
26 changed files with 238 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/android/configure.sh
View File

@@ -8,5 +8,7 @@ LIBUV_VERSION=1.4.0
ZLIB_VERSION=system
NUNICODE_VERSION=1.5.1
LIBZIP_VERSION=0.11.2
GEOJSONVT_VERSION=1.1.0
VARIANT_VERSION=1.0
export MASON_ANDROID_ABI=${MASON_PLATFORM_VERSION}