diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-10-31 18:03:23 -0400 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-10-31 18:03:23 -0400 |
| commit | ce1e151831ce7de7d3d4c4b19d58667504d716c1 (patch) | |
| tree | 6b36e2e252e91039631cc1b9b8535657167aba68 /.gitmodules | |
| parent | b2032103f2fc8567d623a311ff612853d8bce048 (diff) | |
| parent | ec42892f5c43ec69588c66ea3524bc7f5753619b (diff) | |
| download | qtlocation-mapboxgl-ce1e151831ce7de7d3d4c4b19d58667504d716c1.tar.gz | |
Merge branch 'local-mason'
Conflicts:
.gitmodules
styles
Diffstat (limited to '.gitmodules')
| -rw-r--r-- | .gitmodules | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index 81e2c6f9df..588802377e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,6 +6,10 @@ path = test/suite url = https://github.com/mapbox/mapbox-gl-test-suite.git +[submodule ".mason"] + path = .mason + url = https://github.com/mapbox/mason.git + [submodule "styles"] path = styles url = https://github.com/mapbox/mapbox-gl-styles.git |