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

..

map.hpp

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

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

raster_tile_data.hpp

make SourceInfo object noncopyable and use a shared_pointer for it

2014-09-24 16:16:29 +02:00

source.hpp

make SourceInfo object noncopyable and use a shared_pointer for it

2014-09-24 16:16:29 +02:00

sprite.hpp

use util::ptr as a wrapper around std::shared_ptr that asserts nonemptiness

2014-09-24 16:14:09 +02:00

tile_data.hpp

properly ref/unref the handle and run the loop again for shutdown purposes

2014-10-01 13:26:49 +02:00

tile_parser.hpp

use util::ptr as a wrapper around std::shared_ptr that asserts nonemptiness

2014-09-24 16:14:09 +02:00

tile.hpp

use util::ptr as a wrapper around std::shared_ptr that asserts nonemptiness

2014-09-24 16:14:09 +02:00

transform_state.hpp

more include what you use

2014-07-23 13:18:03 +02:00

transform.hpp

use util::ptr as a wrapper around std::shared_ptr that asserts nonemptiness

2014-09-24 16:14:09 +02:00

vector_tile_data.hpp

make SourceInfo object noncopyable and use a shared_pointer for it

2014-09-24 16:16:29 +02:00

vector_tile.hpp

update symbol placement to be more like js

2014-08-04 18:24:22 +02:00

view.hpp

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

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