Konstantin Käfer 4e73a4d47c Merge branch 'master' into tessellation ...

Conflicts:
	include/llmr/renderer/fill_bucket.hpp
	src/renderer/fill_bucket.cpp
	src/renderer/painter.cpp

2014-02-28 12:25:45 +01:00

..

geometry

Merge branch 'master' into tessellation

2014-02-28 12:25:45 +01:00

map

Merge branch 'master' into tessellation

2014-02-28 12:25:45 +01:00

platform

remove remnants of emscripten

2014-02-21 12:34:39 +01:00

renderer

Merge branch 'master' into tessellation

2014-02-28 12:25:45 +01:00

shader

refs #60: first cut of POI rendering

2014-02-14 18:13:12 -08:00

style

make implicit type conversions explicit

2014-02-21 13:08:13 +01:00

util

make implicit type conversions explicit

2014-02-21 13:08:13 +01:00

llmr.hpp

glfw version of sample app

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