Ansis Brammanis ff6a5ce5bc 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

2015-05-28 20:01:15 -04:00

..

android

Ignore deactivate when no valid EGL display. Fixes #1435

2015-05-09 12:02:39 +10:00

ios

Defailablize init methods

2015-05-27 12:51:30 -07:00

map

Merge remote-tracking branch 'origin/master' into new-labelling

2015-05-28 20:01:15 -04:00

platform

Replace mbgl::util::make_unique<> with std::make_unique<>

2015-05-26 17:57:38 +02:00

storage

Replace mbgl::util::make_unique<> with std::make_unique<>

2015-05-26 17:57:38 +02:00

util

Replace mbgl::util::make_unique<> with std::make_unique<>

2015-05-26 17:57:38 +02:00

mbgl.hpp

rename llmr => mbgl

2014-07-16 18:53:56 -07:00