diff options
| author | Justin R. Miller <incanus@codesorcery.net> | 2014-02-21 14:18:48 -0800 |
|---|---|---|
| committer | Justin R. Miller <incanus@codesorcery.net> | 2014-02-21 14:18:48 -0800 |
| commit | e59a5f1c1a9dd2f1921070cb4c03956c1278429b (patch) | |
| tree | 60febe484201a548e37ef741e1e33f1c005f9e60 /macosx/llmr-app.gyp | |
| parent | cfbde8242977c7a1b691261dcd3611915de5714b (diff) | |
| parent | 32da0768b72da5a40a92f8c62465dbe16de2e41e (diff) | |
| download | qtlocation-mapboxgl-e59a5f1c1a9dd2f1921070cb4c03956c1278429b.tar.gz | |
Merge branch 'master' into tile-cancels
Diffstat (limited to 'macosx/llmr-app.gyp')
| -rw-r--r-- | macosx/llmr-app.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/macosx/llmr-app.gyp b/macosx/llmr-app.gyp index b206e8d76a..069f5bb80f 100644 --- a/macosx/llmr-app.gyp +++ b/macosx/llmr-app.gyp @@ -46,7 +46,7 @@ 'CLANG_ENABLE_OBJC_ARC': 'YES' }, "dependencies": [ - "../llmr.gyp:llmr-osx" + "../llmr.gyp:llmr-x86" ] } ] |