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

..

gl.hpp

two render passes

2014-03-11 12:15:06 +01:00

platform.hpp

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

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