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

..

clipper

use std::abs

2014-05-29 13:24:26 -07:00

csscolorparser

always use std:: namespace for math functions

2014-05-14 16:40:24 +02:00

geometry

Match js attribute layout

2014-09-05 13:40:45 -07:00

libtess2

GCC doesn't like #pragmas between the function declaration and definition

2014-10-22 04:17:43 -07:00

map

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

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

platform

do 304 requests and cache them in sqlite

2014-09-24 16:14:09 +02:00

renderer

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

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

shader

Fix build on gcc (fixes #464)

2014-09-08 22:26:10 -07:00

storage

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

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

style

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

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

text

remove outdated comment

2014-10-08 15:59:05 +02:00

util

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

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