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

..

bilinear.cpp

Replace mbgl::util::make_unique<> with std::make_unique<>

2015-05-26 17:57:38 +02:00

binpack.cpp

add BinPack test

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

clip_ids.cpp

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

2015-05-28 20:01:15 -04: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

thread.cpp

Add Thread tests; get argument transfer working for all cases

2015-05-21 19:57:28 -07:00

tile.cpp

Reparse tiles when zoom level > source maxzoom

2015-05-28 19:17:07 -04: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