Ansis Brammanis 7abd7950c9 Merge branch 'master' into new-labelling ...

Conflicts:
	src/mbgl/map/tile_parser.cpp
	src/mbgl/map/tile_parser.hpp
	src/mbgl/renderer/painter.hpp
	src/mbgl/renderer/painter_symbol.cpp
	src/mbgl/renderer/symbol_bucket.cpp
	src/mbgl/renderer/symbol_bucket.hpp
	src/mbgl/text/collision.cpp
	src/mbgl/text/collision.hpp
	src/mbgl/text/placement.cpp

2015-05-19 11:09:33 -04:00

..

api

Resize view from map thread

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

fixtures

Add output of RepeatedRender test to .gitignore

2015-05-15 12:34:57 +03:00

headless

Fix misleading headless test output (fixes #1557)

2015-05-14 13:03:12 -07:00

ios

Privatized MGLMapboxEvents

2015-05-18 11:55:54 -07:00

miscellaneous

Merge branch 'master' into new-labelling

2015-05-19 11:09:33 -04:00

storage

Remove unused

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

suite @ d4fb344525

Render translucent background layers (fixes #1514)

2015-05-15 12:17:32 -07:00

test.gypi

Merge branch 'master' into new-labelling

2015-05-19 11:09:33 -04:00