diff options
| author | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-05-04 11:13:36 +0200 |
|---|---|---|
| committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2018-05-04 11:13:45 +0200 |
| commit | d0166d20086086fc5c4a8e437ed83fd389ee8643 (patch) | |
| tree | 1928c60e483465d4ef8218c801a008afedba99b7 /.gitmodules | |
| parent | d44838125389720e4352dd51ad1da02f4cb58dc8 (diff) | |
| parent | 139414573ab27bd1df1b491aeb6003a6fc0d3d5d (diff) | |
| download | qtlocation-d0166d20086086fc5c4a8e437ed83fd389ee8643.tar.gz | |
Merge remote-tracking branch 'origin/5.11.0' into 5.11
Change-Id: I0bb00d16c891856cfbe1042ce166bbd156e9f41b
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index a5343bfd..22c3849d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "src/3rdparty/mapbox-gl-native"] path = src/3rdparty/mapbox-gl-native url = ../qtlocation-mapboxgl.git - branch = upstream/qt-staging + branch = upstream/qt-staging-5.11.0 |