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

..

mbgl

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

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