Mike Morris e87a6d1871 Merge branch 'master' into android-mason ...

Conflicts:
	gyp/mbgl-ios.gypi
	gyp/mbgl-linux.gypi
	gyp/mbgl-osx.gypi
	platform/default/caching_http_file_source.cpp

2014-12-03 13:07:49 -05:00

..

android

Rename lots of things

2014-12-04 01:10:43 +11:00

geometry

Use unique_ptr

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

map

Merge branch 'master' into android-mason

2014-12-03 13:07:49 -05:00

platform

Merge branch 'master' into android-mason

2014-12-03 13:07:49 -05:00

renderer

Rename lots of things

2014-12-04 01:10:43 +11:00

shader

SDF icon support (fixes #404)

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

storage

Merge branch 'master' into android-mason

2014-12-03 13:07:49 -05: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