Konstantin Käfer 915e89bee8 Merge branch 'master' into symbols ...

Conflicts:
	src/renderer/painter_text.cpp

2014-08-06 15:32:48 +02:00

..

map.hpp

move sprite to a use future loading

2014-07-31 18:14:26 +02:00

raster_tile_data.hpp

more include what you use

2014-07-23 13:18:03 +02:00

source.hpp

more include what you use

2014-07-23 13:18:03 +02:00

sprite.hpp

better warning messages

2014-07-31 18:55:48 +02:00

tile_data.hpp

more include what you use

2014-07-23 13:18:03 +02:00

tile_parser.hpp

update symbol placement to be more like js

2014-08-04 18:24:22 +02:00

tile.hpp

more include what you use

2014-07-23 13:18:03 +02:00

transform_state.hpp

more include what you use

2014-07-23 13:18:03 +02:00

transform.hpp

Remove unused

2014-07-31 17:54:33 -07:00

vector_tile_data.hpp

correctly calculate placement depth

2014-08-05 11:44:50 +02:00

vector_tile.hpp

update symbol placement to be more like js

2014-08-04 18:24:22 +02:00

view.hpp

rename llmr => mbgl

2014-07-16 18:53:56 -07:00