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

Conflicts: src/mbgl/util/geojsonvt
2015-09-15 17:58:36 -04:00
parent 187cc36eb5
commit 7e30025abb
26 changed files with 238 additions and 42 deletions
--- a/scripts/linux/configure.sh
+++ b/scripts/linux/configure.sh
@@ -11,6 +11,8 @@ LIBUV_VERSION=0.10.28
 ZLIB_VERSION=system
 NUNICODE_VERSION=1.5.1
 LIBZIP_VERSION=0.11.2
+GEOJSONVT_VERSION=1.1.0
+VARIANT_VERSION=1.0

 function print_opengl_flags {
    CONFIG+="    'opengl_cflags%': $(quote_flags $(pkg-config gl x11 --cflags)),"$LN