diff options
| author | Leith Bade <leith@mapbox.com> | 2014-12-03 19:56:20 +1100 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2014-12-03 19:56:20 +1100 |
| commit | 8762d5a9b6d8e6da624ac86cd21d8a40efbc1895 (patch) | |
| tree | e235764c1772127b2c5aad3ff20288588cb42070 /gyp | |
| parent | 1bffbb09082cb399f4eb19d85f5d8fcb767a4498 (diff) | |
| parent | 50669307c5648e62941a63e0c75dba8602448d9d (diff) | |
| download | qtlocation-mapboxgl-8762d5a9b6d8e6da624ac86cd21d8a40efbc1895.tar.gz | |
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
include/mbgl/map/map.hpp
src/map/map.cpp
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/mbgl-linux.gypi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gyp/mbgl-linux.gypi b/gyp/mbgl-linux.gypi index 7a249d8638..5bfa8f757d 100644 --- a/gyp/mbgl-linux.gypi +++ b/gyp/mbgl-linux.gypi @@ -8,7 +8,7 @@ 'variables': { 'cflags_cc': [ '<@(png_cflags)', - '<@(jpeg_cflags)', + '<@(jpeg_cflags)', '<@(uv_cflags)', '<@(curl_cflags)', '<@(nu_cflags)', |