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

Conflicts:
	src/renderer/painter_text.cpp

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

..

geometry

include <array>

2014-08-05 15:03:01 +02:00

map

Merge branch 'master' into symbols

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

platform

rename llmr => mbgl

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

renderer

update symbol placement to be more like js

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

shader

Merge branch 'master' into symbols

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

style

change max_angle_delta to max_angle

2014-08-04 18:59:17 +02:00

text

port text alignment algorithm

2014-08-05 16:18:23 +02:00

util

Merge branch 'master' into symbols

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

mbgl.hpp

rename llmr => mbgl

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