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

Conflicts:
	include/mbgl/platform/default/headless_view.hpp
	platform/default/glfw_view.cpp
	platform/default/headless_view.cpp

2014-12-10 19:22:25 +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

Tidy up HeadlessView

2014-12-09 21:47:30 +11:00

headless_view.hpp

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

2014-12-10 19:22:25 +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