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

Conflicts:
	src/map/map.cpp

2014-12-03 22:02:55 +11:00

..

android

Share asset_request between platforms

2014-12-02 19:41:50 +11:00

darwin

restructure gyp files

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

default

Fix tests when using GL 3.0+ context

2014-12-02 21:40:23 +11:00

event.hpp

Fix typo

2014-11-30 19:46:43 +11:00

gl.hpp

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

2014-12-02 19:05:05 +11:00

log.hpp

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

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

platform.hpp

use the default cache location on ios to avoid writing to unwritable file system locations

2014-09-24 17:08:44 +02:00