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

Log the Environment ID and the Thread name

2015-03-18 12:51:33 +01:00

darwin

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

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

default

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

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

ios

#1659 - Converting true to YES, false to NO to match Objective C standards

2015-06-01 15:06:32 -05:00