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

Conflicts:
	src/map/source.cpp

2014-11-23 09:45:17 +11:00

..

android

Rewrite EGL config choosing

2014-11-22 21:40:49 +11:00

geometry

load VAO extension

2014-11-07 18:17:24 +01:00

map

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

2014-11-23 09:45:17 +11:00

platform

Read styles from APK

2014-11-17 23:17:22 +11:00

renderer

Fix variable shadowing

2014-10-29 10:12:41 -04:00

shader

SDF icon support (fixes #404)

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

storage

Use noncopyable

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

style

Support compound text-anchor values

2014-11-04 12:26:27 -08:00

text

Pass FileSource by reference

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

util

Add Map::pause/resume

2014-11-09 22:36:37 +11:00

mbgl.hpp

rename llmr => mbgl

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