Mike Morris 2d1219fa51 Merge branch 'master' into libuv-0.10-headless-display ...

Conflicts:
	common/curl_request.cpp
	common/glfw_view.cpp
	common/glfw_view.hpp
	include/mbgl/platform/request.hpp
	ios/mapbox-gl-cocoa
	setup-libraries.sh
	src/map/map.cpp
	src/platform/request.cpp
	test/fixtures/fixture_request.cpp

2014-10-10 12:24:45 -04:00

..

fixtures

Merge branch 'master' into libuv-0.10-headless-display

2014-10-10 12:24:45 -04:00

clip_ids.cpp

compute unique clip ids per tile, taking covering children into account

2014-08-21 15:02:08 +02:00

comparisons.cpp

rename llmr => mbgl

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

enums.cpp

remove composite enums from tests

2014-08-15 15:53:29 +02:00

functions.cpp

consolidate functions to only use stops

2014-07-17 14:32:35 -07:00

headless.cpp

fix HeadlessView::readPixels return value, ref #480

2014-10-08 16:04:19 -04:00

main.cpp

add gtest

2014-03-17 12:32:27 +01:00

rotation_range.cpp

rename llmr => mbgl

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

style_parser.cpp

fix warnings

2014-08-18 14:05:52 +02:00

test.gyp

break out HeadlessDisplay from HeadlessView, ref #478

2014-10-03 18:31:38 -04:00

tile.cpp

rename llmr => mbgl

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

variant.cpp

rename llmr => mbgl

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