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

..

map.hpp

Merge branch 'master' into android-mason

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

raster_tile_data.hpp

Texturepool ⇢ TexturePool (fixes #655)

2014-12-02 12:24:25 -08:00

source.hpp

Texturepool ⇢ TexturePool (fixes #655)

2014-12-02 12:24:25 -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

Texturepool ⇢ TexturePool (fixes #655)

2014-12-02 12:24:25 -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

Texturepool ⇢ TexturePool (fixes #655)

2014-12-02 12:24:25 -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