diff options
author | Leith Bade <leith@mapbox.com> | 2014-11-18 19:32:20 +1100 |
---|---|---|
committer | Leith Bade <leith@mapbox.com> | 2014-11-18 19:32:20 +1100 |
commit | f89d27cf99c4c661ed4904d5909f8be5006a1161 (patch) | |
tree | 5a9d2f0bb84fa44b97aa46c926f4f89b3fb913eb /README.md | |
parent | 1e8db0bda23cf92ba3de10fc8ba83a27b14d8424 (diff) | |
parent | 947a16e9859cc35a9c6875c09263f45843e30832 (diff) | |
download | qtlocation-mapboxgl-f89d27cf99c4c661ed4904d5909f8be5006a1161.tar.gz |
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
README.md
Diffstat (limited to 'README.md')
-rw-r--r-- | README.md | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -102,6 +102,8 @@ Then, you can then proceed to build the library like: Or proceed to building the debug application with: make linux + +Be sure to setup an access token per below before running `build/Release/mapbox-gl`. ## Android (on Linux) @@ -152,7 +154,7 @@ Run: make android -You can then open `android/java` in Android Studio. +You can then open `android/java` in Android Studio. # Troubleshooting |