Ansis Brammanis 9c03b396c0 Merge remote-tracking branch 'origin/master' into HEAD ...

Conflicts:
	src/mbgl/renderer/painter_fill.cpp

2015-06-03 19:20:41 -04:00

..

api

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

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

fixtures

Add MockFileSource and MockView for testing the ResourceLoader

2015-05-22 10:44:18 +03:00

headless

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

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

ios

Adapt metrics tests to constant flush timer

2015-05-28 17:08:18 -07:00

miscellaneous

Merge remote-tracking branch 'origin/master' into HEAD

2015-06-03 19:20:41 -04:00

storage

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

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

style

Do not call update() asynchronously on the test case

2015-06-02 20:43:29 +03:00

suite @ 632163906f

update test suite

2015-06-02 11:33:03 -04:00

test.gypi

Merge remote-tracking branch 'origin/master' into HEAD

2015-06-03 19:20:41 -04:00