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

Conflicts:
	platform/default/image.cpp

2014-11-12 23:16:56 +11:00

..

glfw_view.hpp

Add noncopyable

2014-11-12 22:01:32 +11:00

glx.h

make tests work

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

headless_display.hpp

Add noncopyable

2014-11-12 22:01:32 +11:00

headless_view.hpp

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

2014-11-12 23:16:56 +11:00

log_stderr.hpp

restructure gyp files

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

settings_json.hpp

restructure gyp files

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