Commit Graph

15 Commits

Author SHA1 Message Date
Leith Bade
634a15332d Fix typo 2014-11-30 19:46:43 +11:00
Leith Bade
2aed807d4c Add coffeecatch to Map::run() 2014-11-16 20:04:36 +11:00
Leith Bade
7d66632209 Change to proper Log functions 2014-11-15 11:14:37 +11:00
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
Konstantin Käfer
582d616deb load VAO extension 2014-11-07 18:17:24 +01:00
Leith Bade
598bc92401 Make image.cpp use Log functions 2014-11-08 01:05:03 +11:00
Konstantin Käfer
253bbd1c5b New mason-based build system 2014-10-22 15:13:35 +02:00
Konstantin Käfer
2f3952b305 fix compile warnings 2014-10-22 11:00:34 +02:00
John Firebaugh
4e9688e430 Fix compiler warnings 2014-10-17 11:12:31 -07:00
Konstantin Käfer
34fe7dc627 add basic request caching with sqlite 2014-09-24 16:12:02 +02:00
John Firebaugh
bb9a466adb Revert "Avoid zero size array warning"
This reverts commit d4fd57aae9.
2014-09-03 17:04:38 -07:00
John Firebaugh
d4fd57aae9 Avoid zero size array warning 2014-08-28 12:23:44 -07:00
Konstantin Käfer
a55be0217b test with the current release type's settings to avoid double compiles 2014-08-27 12:37:07 +02:00
John Firebaugh
70a31baf5c Eliminate warnings 2014-08-07 13:02:40 -07:00
Konstantin Käfer
4ea281c750 rename llmr => mbgl 2014-07-16 18:53:56 -07:00