diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-02-28 12:25:45 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-02-28 12:25:45 +0100 |
| commit | 4e73a4d47cd1287f6a5ac3bfc66dc024b0b268e4 (patch) | |
| tree | 70def4e281be863605a6c93d9ec51be7b6497c69 /.gitignore | |
| parent | ae3bd04171a671a877c3240ed505096186c280cc (diff) | |
| parent | 675b8eb1fef9e4fc99516b2fa64505107b1fa6bf (diff) | |
| download | qtlocation-mapboxgl-4e73a4d47cd1287f6a5ac3bfc66dc024b0b268e4.tar.gz | |
Merge branch 'master' into tessellation
Conflicts:
include/llmr/renderer/fill_bucket.hpp
src/renderer/fill_bucket.cpp
src/renderer/painter.cpp
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore index bbd74195c0..d9eef726c0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,9 @@ -*.o -/emscripten/main.js -/emscripten/main.js.map -/build -*.sublime-* -config.gypi -config.mk -.DS_Store -out -mapnik-packaging *.xcodeproj +*.o +/out +/mapnik-packaging +/macosx/build +/ios/build +/config.gypi +/config.mk +/build
\ No newline at end of file |