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

Conflicts:
	.gitignore
	gyp/mbgl-ios.gypi
	gyp/mbgl-linux.gypi
	gyp/mbgl-osx.gypi
	include/mbgl/map/map.hpp
	src/mbgl/map/map.cpp
	src/mbgl/storage/caching_http_file_source.cpp

2014-12-05 23:16:49 +11:00

..

enum.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

mat4.hpp

rename llmr => mbgl

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

math.hpp

remove usage of relative paths

2014-12-04 20:02:51 +01:00

noncopyable.hpp

rename llmr => mbgl

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

parsedate.h

do 304 requests and cache them in sqlite

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

ptr.hpp

fix gcc cannot call member function without object error

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

recursive_wrapper.hpp

update mapbox/variant

2014-08-19 11:38:26 +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

string.hpp

remove use of std::to_string in favor of boost::lexical_cast

2014-12-04 12:59:09 +01:00

time.hpp

replace strftime_l with our custom formatter

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

utf.hpp

make util::utf8_to_utf32::convert() static

2014-11-03 15:44:27 +00: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.hpp

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

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

variant.hpp

remove usage of relative paths

2014-12-04 20:02:51 +01:00

vec.hpp

make most headers private

2014-12-04 20:02:50 +01:00