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 /llmr.gyp | |
| 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 'llmr.gyp')
| -rw-r--r-- | llmr.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -5,8 +5,8 @@ ], 'targets': [ { - 'target_name': 'llmr-osx', - 'product_name': 'llmr-osx', + 'target_name': 'llmr-x86', + 'product_name': 'llmr-x86', 'type': 'static_library', 'sources': [ '<!@(find src -name "*.cpp")', |