diff options
| author | Leith Bade <leith@mapbox.com> | 2014-12-05 23:16:49 +1100 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2014-12-05 23:16:49 +1100 |
| commit | de9eb00276684a10f49a1c490f55266b80238155 (patch) | |
| tree | fc713b06541bb1af04e95c70f2e383bcb86a164a /.gitignore | |
| parent | c348c141c5c5754c962d9b7e94af83f097e30487 (diff) | |
| parent | ff640132de0fe855314a8fd86adae3a2fb33237b (diff) | |
| download | qtlocation-mapboxgl-de9eb00276684a10f49a1c490f55266b80238155.tar.gz | |
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
.gitignore
gyp/mbgl-ios.gypi
gyp/mbgl-linux.gypi
gyp/mbgl-osx.gypi
include/mbgl/map/map.hpp
src/mbgl/map/map.cpp
src/mbgl/storage/caching_http_file_source.cpp
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 589b166759..98d9e28281 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,6 @@ /config.gypi /config-ios.gypi /config-android.gypi -/config/constants_local.cpp /build /include/mbgl/shader/shaders.hpp /src/shader/shaders_gl.cpp |