diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-07-01 15:28:47 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-07-01 15:28:47 +0200 |
| commit | 231e3ef80c65a0b3f4f1493703962131866308f7 (patch) | |
| tree | 590b6956027d1281813a2bb041a4a7b77c4ca2e4 /.travis.yml | |
| parent | 0a4319ead0396d12bffd788a2fdabf96a0424534 (diff) | |
| parent | d8dba62a210909f1b6dff7c61ac82ea0358575f7 (diff) | |
| download | qtlocation-mapboxgl-231e3ef80c65a0b3f4f1493703962131866308f7.tar.gz | |
Merge branch 'master' into style-v3
Conflicts:
.travis.yml
common/glfw_view.cpp
include/llmr/map/source.hpp
src/map/map.cpp
src/map/source.cpp
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index ec315f3576..f2349fdd3f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ language: cpp os: - linux - - osx compiler: - gcc |