diff options
| author | Brad Leege <bleege@gmail.com> | 2016-07-19 16:32:45 -0500 |
|---|---|---|
| committer | Brad Leege <bleege@gmail.com> | 2016-07-19 16:32:45 -0500 |
| commit | 1972d932d5a69f3a9cdf1e76d87d482bdc256373 (patch) | |
| tree | e6276571e4c5b9ed69d15b9d8035178536a68196 /test/util | |
| parent | a53dfcd675049943443def6b65cc8b654faa7a90 (diff) | |
| parent | 5ef2cbf9422feda02a79bdefea88fb13d7830f79 (diff) | |
| download | qtlocation-mapboxgl-1972d932d5a69f3a9cdf1e76d87d482bdc256373.tar.gz | |
Merge branch 'release-android-v4.1.1'
# Conflicts:
# platform/android/MapboxGLAndroidSDK/gradle.properties
# test/util/mapbox.cpp
Diffstat (limited to 'test/util')
| -rw-r--r-- | test/util/mapbox.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/test/util/mapbox.cpp b/test/util/mapbox.cpp index 35c478287c..9341b695f3 100644 --- a/test/util/mapbox.cpp +++ b/test/util/mapbox.cpp @@ -7,7 +7,6 @@ using namespace mbgl; - TEST(Mapbox, SourceURL) { EXPECT_EQ( "https://api.mapbox.com/v4/user.map.json?access_token=key&secure", |