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

Conflicts:
	include/mbgl/map/map.hpp
	src/map/map.cpp

2014-12-03 19:56:20 +11:00

..

bucket.hpp

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

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

debug_bucket.hpp

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

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

fill_bucket.hpp

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

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

frame_history.hpp

fix variable shadowing

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

line_bucket.hpp

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

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

painter.hpp

Fix variable shadowing

2014-10-29 10:12:41 -04:00

prerendered_texture.hpp

Check for packed depth stencil

2014-11-28 00:11:37 +11:00

raster_bucket.hpp

Texturepool ⇢ TexturePool (fixes #655)

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

symbol_bucket.hpp

make addGlyphsToAtlas static method of SymbolBucket + add addGlyphs method to minimise number of mutex locking

2014-10-27 14:18:11 -04:00