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

..

android

Ignore deactivate when no valid EGL display. Fixes #1435

2015-05-09 12:02:39 +10:00

ios

Defailablize init methods

2015-05-27 12:51:30 -07:00

map

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

2015-05-28 20:01:15 -04:00

platform

Remove references to ResourceLoader

2015-06-02 20:23:03 +03:00

storage

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

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

util

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

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

mbgl.hpp

rename llmr => mbgl

2014-07-16 18:53:56 -07:00