Ansis Brammanis 148294d3ac Merge branch 'master' into new-labelling ...

Conflicts:
	src/mbgl/renderer/symbol_bucket.cpp
	src/mbgl/renderer/symbol_bucket.hpp
	src/mbgl/text/collision.cpp
	src/mbgl/text/glyph_store.cpp
	src/mbgl/text/placement.cpp
	src/mbgl/text/rotation_range.cpp

2015-04-03 12:04:31 -07:00

..

fixtures

replace iterator variable types with auto

2015-04-01 16:42:42 +02:00

headless

Update the FixtureLog

2015-03-12 13:28:41 +02:00

ios

move iOS code from gl-cocoa to this project

2015-02-09 18:01:40 -08:00

miscellaneous

Merge branch 'master' into new-labelling

2015-04-03 12:04:31 -07:00

storage

Add typedefs for std::chrono::steady_clock types

2015-04-02 12:28:12 +02:00

suite @ 6ac1515382

Move to mapbox bucket

2015-02-13 23:07:45 -08:00

test.gyp

remove tests for deleted rotation_range

2015-04-02 12:52:55 -07:00