Leith Bade 70057e1b8e Merge branch 'master' of https://github.com/mapbox/mapbox-gl-native into android-mason ...

Conflicts:
	gyp/common.gypi
	include/mbgl/geometry/vao.hpp
	include/mbgl/platform/event.hpp
	include/mbgl/platform/gl.hpp
	platform/default/http_request_baton_curl.cpp
	src/storage/response.cpp

2014-11-09 00:35:52 +11:00

..

base_request.cpp

add reachability

2014-09-29 14:02:42 +02:00

file_request_baton.cpp

add missing include header

2014-10-22 16:37:59 +02:00

file_request.cpp

move file request baton to its own file

2014-09-30 17:29:09 +02:00

file_source.cpp

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

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

http_request_baton.cpp

add back CURL requesting

2014-09-24 16:19:47 +02:00

http_request.cpp

Temp disable SSL cert validation

2014-11-08 08:44:39 +11:00

request.cpp

notifications on request cancellation

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

response.cpp

add -Werror to os x as well

2014-11-06 14:18:52 +01:00

sqlite_store.cpp

fix variable shadowing

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