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

..

bilinear.cpp

support wrapped bilinear scaling

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

binpack.cpp

add BinPack test

2015-05-12 20:46:56 -07:00

clip_ids.cpp

Move ClipID to clip_id.hpp/cpp

2015-04-09 10:58:11 -07:00

comparisons.cpp

Added tests for 6292e95f80

2015-05-07 11:05:05 -07: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

map_context.cpp

Removed unneeded unique_ptr

2015-05-15 16:49:02 +03:00

map.cpp

Ignore deactivate when no valid EGL display. Fixes #1435

2015-05-09 12:02:39 +10: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

Tile::ID ⇢ TileID

2015-04-06 13:58:56 -07:00

transform.cpp

ignore Transform changes with NaN parameters

2015-05-08 20:25:47 +02:00

variant.cpp

rearrange tests and make more robust

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

worker.cpp

make WorkRequests cancelable

2015-05-08 16:43:18 +02:00