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.hpp

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

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

tile.hpp

remove use of std::to_string in favor of boost::lexical_cast

2014-12-04 12:59:09 +01:00

transform_state.hpp

make most headers private

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

transform.hpp

Remove rotation constraints

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

view.hpp

fix variable shadowing

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