Konstantin Käfer 51f523ec14 Merge branch 'master' into outdoors-style ...

Conflicts:
	bin/style.js
	include/llmr/map/transform.hpp
	src/renderer/painter.cpp
	src/text/placement.cpp

2014-05-14 17:42:10 +02:00

..

geometry

do not use shared pointers for buffers

2014-03-25 13:41:20 +01:00

map

Merge branch 'master' into outdoors-style

2014-05-14 17:42:10 +02:00

platform

fix comment

2014-05-02 10:30:52 +02:00

renderer

return refs to avoid matrix allocation/deallocation for untranslated layers

2014-05-14 17:21:51 +02:00

shader

squashed stylequest merge

2014-05-07 10:37:25 -07:00

style

Merge branch 'master' into outdoors-style

2014-05-14 17:42:10 +02:00

text

implement alwaysVisible

2014-03-24 17:38:10 +01:00

util

always use std:: namespace for math functions

2014-05-14 16:40:24 +02:00

llmr.hpp

remove concept of settings object from library

2014-04-30 13:47:03 +02:00