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

..

environment.hpp

Remove unused

2015-05-13 13:54:16 -07:00

map.hpp

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

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

mode.hpp

Remove Map::start/stop

2015-04-28 14:32:24 -04:00

still_image.hpp

align static render mode and still image render mode

2015-04-17 13:40:42 +02:00

update.hpp

Ignore deactivate when no valid EGL display. Fixes #1435

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

view.hpp

Resize view from map thread

2015-04-28 14:32:24 -04:00