Leith Bade 8f1754cf0a Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason ...

Conflicts:
	include/mbgl/storage/base_request.hpp
	include/mbgl/storage/file_request_baton.hpp
	include/mbgl/storage/http_request.hpp
	include/mbgl/storage/http_request_baton.hpp
	include/mbgl/util/uv_detail.hpp
	platform/darwin/http_request_baton_cocoa.mm
	platform/default/caching_http_file_source.cpp
	platform/default/http_request_baton_curl.cpp
	src/map/map.cpp
	src/storage/base_request.cpp
	src/storage/file_request.cpp
	src/storage/file_request_baton.cpp
	src/storage/http_request.cpp
	src/storage/http_request_baton.cpp

2014-12-04 22:19:46 +11:00

..

clip_ids.hpp

don't trip up certain stdlib implementations

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

compression.hpp

compress data and store type

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

constants.hpp

rename llmr => mbgl

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

enum.hpp

fix variable shadowing

2014-10-22 18:19:01 +02:00

error.hpp

fix variable shadowing

2014-10-22 18:19:01 +02:00

image.hpp

use CoreImage for decoding/encoding images on osx/ios

2014-10-30 12:02:28 -04:00

interpolate.hpp

do 304 requests and cache them in sqlite

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

io.hpp

rename llmr => mbgl

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

mapbox.hpp

Support for Mapbox fontstack API

2014-08-22 17:14:51 -07:00

mat3.hpp

background-image support

2014-10-17 10:44:38 -07:00

mat4.hpp

rename llmr => mbgl

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

math.hpp

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

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

noncopyable.hpp

rename llmr => mbgl

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

optional.hpp

replace boost optional with mapbox optional

2014-10-22 16:29:10 +02:00

parsedate.h

do 304 requests and cache them in sqlite

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

pbf.hpp

gcc fixes

2014-10-23 02:46:15 -07:00

ptr.hpp

fix gcc cannot call member function without object error

2014-10-01 05:20:12 -07:00

queue.h

do 304 requests and cache them in sqlite

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

raster.hpp

Texturepool ⇢ TexturePool (fixes #655)

2014-12-02 12:24:25 -08:00

rect.hpp

fix variable shadowing

2014-10-22 18:19:01 +02:00

recursive_wrapper.hpp

update mapbox/variant

2014-08-19 11:38:26 +02:00

sqlite3.hpp

do 304 requests and cache them in sqlite

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

std.hpp

add array overloads to make_unique and move it to mbgl::util from std

2014-12-03 11:27:24 +01:00

stopwatch.hpp

gyp fixes

2014-10-28 12:47:58 -04:00

string.hpp

rename llmr => mbgl

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

texture_pool.hpp

Texturepool ⇢ TexturePool (fixes #655)

2014-12-02 12:24:25 -08:00

time.hpp

replace strftime_l with our custom formatter

2014-11-04 06:44:50 -08:00

token.hpp

also allow underscores in token names

2014-10-30 15:06:18 -04:00

transition.hpp

gcc fixes

2014-10-23 02:46:15 -07:00

unitbezier.hpp

rename llmr => mbgl

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

url.hpp

fix basepath for headless stylesheets

2014-08-27 14:28:56 +02:00

utf.hpp

make util::utf8_to_utf32::convert() static

2014-11-03 15:44:27 +00:00

uv_detail.hpp

Prefer stdlib to libuv (fixes #688)

2014-12-03 17:38:10 -08:00

uv-channel.h

do 304 requests and cache them in sqlite

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

uv-messenger.h

allow providing a callback to uv_messenger_stop to prevent mismatched new/free

2014-10-30 17:47:34 -04:00

uv-worker.h

link boost when the boost variable is set

2014-10-22 10:45:50 +02:00

uv.hpp

Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason

2014-12-04 22:19:46 +11:00

variant.hpp

replace boost optional with mapbox optional

2014-10-22 16:29:10 +02:00

vec.hpp

fix variable shadowing

2014-10-22 18:19:01 +02:00