Mike Morris 050b00cb58 Merge branch 'master' into libuv010 ...

Conflicts:
	setup-libraries.sh

2014-08-26 16:55:08 -04:00

..

geometry

Rename existing interpolate -> resample

2014-08-20 13:52:39 -07:00

map

Merge branch 'master' into libuv010

2014-08-26 16:55:08 -04:00

platform

Merge branch 'master' into libuv010

2014-08-26 16:55:08 -04:00

renderer

remove support for composite layers

2014-08-15 15:52:53 +02:00

shader

remove support for composite layers

2014-08-15 15:52:53 +02:00

style

Load TileJSON; support inline TileJSON sources

2014-08-21 16:12:27 -07:00

text

add a few fixes for gcc

2014-08-21 15:46:20 +02:00

util

Merge branch 'master' into libuv010

2014-08-26 16:55:08 -04:00

mbgl.hpp

rename llmr => mbgl

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