Commit Graph

8 Commits

Author SHA1 Message Date
Leith Bade
f0e4e27cd3 Read styles from APK 2014-11-17 23:17:22 +11:00
Konstantin Käfer
74387c54e3 add missing include header 2014-10-22 16:37:59 +02:00
Konstantin Käfer
02e88e445d fixes for libuv 0.11 2014-10-22 15:29:28 +02:00
Konstantin Käfer
905c4294be Merge branch 'libuv-0.10-headless-display' into mason
Conflicts:
	common/http_request_baton_curl.cpp
	include/mbgl/map/map.hpp
	include/mbgl/util/uv_detail.hpp
	scripts/travis_before_install.sh
	setup-libraries.sh
	src/map/map.cpp
	src/storage/file_request_baton.cpp
	src/storage/http_request.cpp
	src/util/uv-messenger.c
2014-10-22 15:14:21 +02:00
Konstantin Käfer
3a39d69504 link boost when the boost variable is set 2014-10-22 10:45:50 +02:00
Konstantin Käfer
5a87fb337d first attempt at using mason to install packages
[skip ci]
2014-10-20 17:55:49 +02:00
Mike Morris
ee68c091a8 adjust file_request_baton and http_request for libuv 0.10 api 2014-10-10 13:25:26 -04:00
Konstantin Käfer
a9039cf5d7 move file request baton to its own file 2014-09-30 17:29:09 +02:00