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

Conflicts:
	ios/mapbox-gl-cocoa

2014-11-21 20:36:55 +11:00

..

map.hpp

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

2014-11-21 20:36:55 +11:00

raster_tile_data.hpp

pass Tile::ID by const ref

2014-10-30 10:43:58 -04:00

source.hpp

make SourceInfo object noncopyable and use a shared_pointer for it

2014-09-24 16:16:29 +02:00

sprite.hpp

use util::ptr as a wrapper around std::shared_ptr that asserts nonemptiness

2014-09-24 16:14:09 +02:00

tile_data.hpp

pass Tile::ID by const ref

2014-10-30 10:43:58 -04:00

tile_parser.hpp

store spriteAtlas by value + make TileParser noncopyable

2014-10-29 14:09:06 -04: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 Tile::ID by const ref

2014-10-30 10:43:58 -04: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