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

..

map.hpp

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

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

raster_tile_data.hpp

Pass SourceInfo as reference

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

source.hpp

Inline Source::updateTiles()

2014-11-26 16:01:15 -08:00

sprite.hpp

Pass FileSource by reference

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

tile_data.hpp

Pass SourceInfo as reference

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

tile_parser.hpp

Eliminate Map::getTexturepool()

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

tile.hpp

fix variable shadowing

2014-10-22 18:19:01 +02:00

transform_state.hpp

Render map with a copy of TransformState

2014-10-29 09:58:56 -04:00

transform.hpp

Remove rotation constraints

2014-11-20 15:13:23 -08:00

vector_tile_data.hpp

Pass SourceInfo as reference

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

vector_tile.hpp

Implement v6 filters

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

view.hpp

fix variable shadowing

2014-10-22 18:19:01 +02:00