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

..

http_request_baton_cocoa.mm

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

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

image.mm

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

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

log_nslog.mm

make tests work

2014-10-24 17:44:51 +02:00

reachability.m

restructure gyp files

2014-10-24 16:40:08 +02:00

settings_nsuserdefaults.mm

restructure gyp files

2014-10-24 16:40:08 +02:00

string_nsstring.mm

restructure gyp files

2014-10-24 16:40:08 +02:00