Mike Morris 15564b81a3 Merge branch 'fix-context-shutdown-merge' into libuv-0.10-fix-context-shutdown ...

Conflicts:
	src/map/map.cpp

2014-09-10 18:53:20 -04:00

..

geometry

Add SpriteAtlas::getPosition()

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

map

Merge branch 'fix-context-shutdown-merge' into libuv-0.10-fix-context-shutdown

2014-09-10 18:53:20 -04:00

platform

Merge branch 'master' into libuv010

2014-09-09 17:06:22 -04:00

renderer

Adds the function Map::terminate() to allow all GL resources held

2014-09-10 18:31:20 -04:00

shader

SDF icon support (fixes #404)

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

style

Fix text/icon-translate-anchor

2014-09-04 15:38:14 -07:00

text

Fix text-line-height

2014-08-28 18:44:11 -07:00

util

Merge branch 'master' into libuv010

2014-08-27 14:41:30 -04:00

mbgl.hpp

rename llmr => mbgl

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