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

Conflicts:
	README.md
	configure
	gyp/mbgl-linux.gypi
	include/mbgl/map/map.hpp
	include/mbgl/platform/default/image_reader.hpp
	include/mbgl/platform/default/jpeg_reader.hpp
	include/mbgl/platform/default/png_reader.hpp
	include/mbgl/util/uv_detail.hpp
	ios/mapbox-gl-cocoa
	platform/default/image.cpp
	platform/default/image_reader.cpp
	platform/default/jpeg_reader.cpp
	platform/default/png_reader.cpp
	src/map/map.cpp

2014-11-28 01:51:21 +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

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

2014-11-28 01:51:21 +11:00

platform

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

2014-11-28 01:51:21 +11:00

renderer

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

2014-11-28 01:51:21 +11: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

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-11-28 01:51:21 +11:00

mbgl.hpp

rename llmr => mbgl

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