diff options
| author | Ansis Brammanis <brammanis@gmail.com> | 2015-05-28 20:01:15 -0400 |
|---|---|---|
| committer | Ansis Brammanis <brammanis@gmail.com> | 2015-05-28 20:01:15 -0400 |
| commit | ff6a5ce5bc674e17a24c3f18b305d5dd2f0e21b0 (patch) | |
| tree | 405ec719109186590311262045ff1651b06e9506 /styles | |
| parent | fd19eb79056b8e62f037c0ae4532f4f7cc970580 (diff) | |
| parent | 6c166b564ebb3acefb56bb4d39be4813851db4a7 (diff) | |
| download | qtlocation-mapboxgl-ff6a5ce5bc674e17a24c3f18b305d5dd2f0e21b0.tar.gz | |
Merge remote-tracking branch 'origin/master' into new-labelling
Conflicts:
src/mbgl/map/source.cpp
src/mbgl/map/source.hpp
src/mbgl/map/tile_data.cpp
src/mbgl/map/tile_parser.cpp
src/mbgl/map/vector_tile_data.cpp
src/mbgl/renderer/painter.cpp
src/mbgl/renderer/symbol_bucket.cpp
src/mbgl/text/glyph.hpp
src/mbgl/text/glyph_store.cpp
src/mbgl/text/placement.cpp
test/suite
Diffstat (limited to 'styles')
0 files changed, 0 insertions, 0 deletions