de9eb00276
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
16 lines
235 B
Plaintext
16 lines
235 B
Plaintext
.DS_Store
|
|
*.xcodeproj
|
|
*.o
|
|
*.actual.png
|
|
*.diff.png
|
|
/mason_packages
|
|
/config.gypi
|
|
/config-ios.gypi
|
|
/config-android.gypi
|
|
/build
|
|
/include/mbgl/shader/shaders.hpp
|
|
/src/shader/shaders_gl.cpp
|
|
/src/shader/shaders_gles2.cpp
|
|
/bin/style.bin.js
|
|
*~
|