diff options
| author | Mike Morris <michael.patrick.morris@gmail.com> | 2014-07-17 12:44:45 -0400 |
|---|---|---|
| committer | Mike Morris <michael.patrick.morris@gmail.com> | 2014-07-17 12:44:45 -0400 |
| commit | 4cb9972278c2121a87161e3b02b2071acc1ca8e1 (patch) | |
| tree | b0f017fda1740503c1bd7d5e3a28e586648d2e77 /bin/package.json | |
| parent | 056f9e88d5214ae5752ec946666c756e2bf3d72b (diff) | |
| parent | fa4133a094a084527633038d2de1982ed4898a08 (diff) | |
| download | qtlocation-mapboxgl-4cb9972278c2121a87161e3b02b2071acc1ca8e1.tar.gz | |
Merge branch 'master' into fuzz-pipe
Conflicts:
bin/package.json
src/style/style_parser.cpp
test/fixtures/fixture_log.cpp
test/test.gyp
Diffstat (limited to 'bin/package.json')
| -rw-r--r-- | bin/package.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/package.json b/bin/package.json index 77edcb9bfa..50843fa4b8 100644 --- a/bin/package.json +++ b/bin/package.json @@ -1,5 +1,5 @@ { - "name": "llmr-native", + "name": "mbgl-native", "version": "0.0.1", "dependencies": { "brfs": "^1.1.2", |