Konstantin Käfer 78c10c0701 Merge remote-tracking branch 'remotes/origin/pr/127' ...

Conflicts:
	include/llmr/map/map.hpp
	src/map/map.cpp
	src/platform/platform.cpp

2014-04-15 12:46:19 -04:00

..

geometry

do not use shared pointers for buffers

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

map

Merge remote-tracking branch 'remotes/origin/pr/127'

2014-04-15 12:46:19 -04:00

platform

Merge remote-tracking branch 'remotes/origin/pr/127'

2014-04-15 12:46:19 -04:00

renderer

Merge remote-tracking branch 'remotes/origin/pr/127'

2014-04-15 12:46:19 -04:00

shader

add support for background opacity in style

2014-04-02 16:09:31 -07:00

style

Merge remote-tracking branch 'remotes/origin/pr/127'

2014-04-15 12:46:19 -04:00

text

implement alwaysVisible

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

util

fix build on linux

2014-04-14 19:43:30 -04:00

llmr.hpp

glfw version of sample app

2014-01-07 12:10:14 +01:00