Leith Bade 94d34ce7ac Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason ...

Conflicts:
	src/map/map.cpp

2014-12-03 22:02:55 +11:00

..

android

Add fps mode for #646

2014-11-28 00:19:11 +11:00

geometry

Use unique_ptr

2014-11-26 15:13:14 -08:00

map

Fix names in Map

2014-12-03 20:09:16 +11:00

platform

Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason

2014-12-03 22:02:55 +11:00

renderer

Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason

2014-12-03 19:56:20 +11:00

shader

SDF icon support (fixes #404)

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

storage

Use uv::async and various other fixes

2014-12-03 21:57:55 +11:00

style

Store SourceInfo as direct member

2014-11-26 15:13:14 -08:00

text

Pass FileSource by reference

2014-11-21 14:25:11 -08:00

util

Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason

2014-12-03 22:02:55 +11:00

mbgl.hpp

rename llmr => mbgl

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