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

Conflicts:
	src/mbgl/map/map.cpp

2014-12-08 20:19:41 +11:00

..

map.cpp

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

2014-12-08 20:19:41 +11:00

raster_tile_data.cpp

make most headers private

2014-12-04 20:02:50 +01:00

raster_tile_data.hpp

make most headers private

2014-12-04 20:02:50 +01:00

source.cpp

Move setAccessToken to CachingHTTPFileSource

2014-12-04 17:03:23 -08:00

source.hpp

make most headers private

2014-12-04 20:02:50 +01:00

sprite.cpp

make most headers private

2014-12-04 20:02:50 +01:00

sprite.hpp

make most headers private

2014-12-04 20:02:50 +01:00

tile_data.cpp

make most headers private

2014-12-04 20:02:50 +01:00

tile_data.hpp

make most headers private

2014-12-04 20:02:50 +01:00

tile_parser.cpp

make most headers private

2014-12-04 20:02:50 +01:00

tile_parser.hpp

make most headers private

2014-12-04 20:02:50 +01:00

tile.cpp

make most headers private

2014-12-04 20:02:50 +01:00

transform_state.cpp

make most headers private

2014-12-04 20:02:50 +01:00

transform.cpp

make most headers private

2014-12-04 20:02:50 +01:00

vector_tile_data.cpp

make most headers private

2014-12-04 20:02:50 +01:00

vector_tile_data.hpp

make most headers private

2014-12-04 20:02:50 +01:00

vector_tile.cpp

make most headers private

2014-12-04 20:02:50 +01:00

vector_tile.hpp

make most headers private

2014-12-04 20:02:50 +01:00