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

..

bilinear.cpp

support wrapped bilinear scaling

2015-03-26 10:45:23 +01:00

clip_ids.cpp

rearrange tests and make more robust

2015-02-04 10:49:06 +01:00

comparisons.cpp

rearrange tests and make more robust

2015-02-04 10:49:06 +01:00

enums.cpp

rearrange tests and make more robust

2015-02-04 10:49:06 +01:00

functions.cpp

rearrange tests and make more robust

2015-02-04 10:49:06 +01:00

mapbox.cpp

add style URL tests

2015-03-31 13:54:51 -07:00

merge_lines.cpp

rearrange tests and add storage tests

2015-02-04 10:49:05 +01:00

style_parser.cpp

Revert "Move atlas ownership to Style"

2015-03-13 13:05:32 -07:00

text_conversions.cpp

rearrange tests and make more robust

2015-02-04 10:49:06 +01:00

tile.cpp

rearrange tests and make more robust

2015-02-04 10:49:06 +01:00

variant.cpp

rearrange tests and make more robust

2015-02-04 10:49:06 +01:00