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

..

glfw_view.hpp

Merge remote-tracking branch 'origin/headless-display' into gyp-restructuring

2014-10-24 16:41:04 +02:00

glx.h

make tests work

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

headless_display.hpp

fix build

2014-12-04 20:13:08 +01:00

headless_view.hpp

Rename lots of things

2014-12-04 01:10:43 +11:00

image_reader.hpp

convert image_reader public interface to use CamelCase to match the rest of codebase

2014-11-26 17:50:12 +01:00

jpeg_reader.hpp

convert image_reader public interface to use CamelCase to match the rest of codebase

2014-11-26 17:50:12 +01:00

log_stderr.hpp

restructure gyp files

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

png_reader.hpp

convert image_reader public interface to use CamelCase to match the rest of codebase

2014-11-26 17:50:12 +01:00

settings_json.hpp

restructure gyp files

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