Leith Bade
|
70057e1b8e
|
Merge branch 'master' of https://github.com/mapbox/mapbox-gl-native into android-mason
Conflicts:
gyp/common.gypi
include/mbgl/geometry/vao.hpp
include/mbgl/platform/event.hpp
include/mbgl/platform/gl.hpp
platform/default/http_request_baton_curl.cpp
src/storage/response.cpp
|
2014-11-09 00:35:52 +11:00 |
|
Justin R. Miller
|
ee482fbf6e
|
fix styles path
|
2014-11-07 16:28:19 -08:00 |
|
Leith Bade
|
0ac4247f72
|
Temp disable SSL cert validation
|
2014-11-08 08:44:39 +11:00 |
|
Leith Bade
|
c0c6d9d78e
|
Link all libs statically
|
2014-11-06 18:56:33 +11:00 |
|
Leith Bade
|
0da778d244
|
Move cpp files into dir
|
2014-11-06 00:02:17 +11:00 |
|
Leith Bade
|
9476b7a66f
|
Add JNI code to build system
|
2014-11-05 22:53:48 +11:00 |
|