Leith Bade
|
aaedd9c83b
|
Remove program binary caching
|
2015-01-27 12:38:40 +11:00 |
|
Leith Bade
|
d599fc5504
|
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
platform/default/glfw_view.cpp
platform/default/headless_view.cpp
src/mbgl/renderer/painter.cpp
src/mbgl/renderer/prerendered_texture.cpp
|
2014-12-11 00:09:26 +11:00 |
|
Konstantin Käfer
|
4ad28c931a
|
only report STACK_OVERFLOW/STACK_UNDERFLOW when the GL implementation has them
|
2014-12-10 13:46:26 +01:00 |
|
Konstantin Käfer
|
93d56294cf
|
update error reporting function
|
2014-12-10 13:21:08 +01:00 |
|
Leith Bade
|
127600ef8c
|
Fix unused param
|
2014-12-10 22:23:53 +11:00 |
|
Leith Bade
|
08b07c30a7
|
Reduce GL log spew
|
2014-12-10 22:15:41 +11:00 |
|
Leith Bade
|
b534520d6c
|
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
include/mbgl/platform/gl.hpp
src/mbgl/platform/gl.cpp
src/mbgl/shader/shader.cpp
|
2014-12-07 00:29:20 +11:00 |
|
Leith Bade
|
67c1ff2f95
|
Fix rebase
|
2014-12-06 14:28:34 +11:00 |
|
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 |
|
Konstantin Käfer
|
abafb52f37
|
make most headers private
|
2014-12-04 20:02:50 +01:00 |
|