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

Conflicts:
	src/renderer/painter_text.cpp

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

..

composite_shader.hpp

rename llmr => mbgl

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

dot_shader.hpp

rename llmr => mbgl

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

gaussian_shader.hpp

rename llmr => mbgl

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

icon_shader.hpp

fix icon rendering

2014-08-06 12:36:19 +02:00

line_shader.hpp

implement line-blur and fix retina antialiasing

2014-08-05 14:17:00 -07:00

linejoin_shader.hpp

rename llmr => mbgl

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

outline_shader.hpp

rename llmr => mbgl

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

pattern_shader.hpp

rename llmr => mbgl

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

plain_shader.hpp

rename llmr => mbgl

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

raster_shader.hpp

rename llmr => mbgl

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

shader.hpp

rename llmr => mbgl

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

text_shader.hpp

rename llmr => mbgl

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