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

..

geometry

Add SpriteAtlas::getPosition()

2014-09-03 18:12:40 -07:00

map

Merge branch 'libuv-0.10-headless-display' into mason

2014-10-22 15:14:21 +02:00

platform

fix compile warnings

2014-10-22 11:00:34 +02:00

renderer

Merge branch 'master' into libuv-0.10-headless-display

2014-10-10 12:24:45 -04:00

shader

SDF icon support (fixes #404)

2014-09-08 15:12:32 -07:00

storage

move file request baton to its own file

2014-09-30 17:29:09 +02:00

style

Merge branch 'master' into libuv-0.10-headless-display

2014-10-10 12:24:45 -04:00

text

link boost when the boost variable is set

2014-10-22 10:45:50 +02:00

util

link boost when the boost variable is set

2014-10-22 10:45:50 +02:00

mbgl.hpp

rename llmr => mbgl

2014-07-16 18:53:56 -07:00