Konstantin Käfer 5f64ecc3cc Merge branch 'master' into linux-wrapper ...

Conflicts:
	include/llmr/style/sprite.hpp

2014-02-21 12:26:16 +01:00

..

geometry

refs #60: first cut of POI rendering

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

map

Merge pull request #68 from mapbox/poi-render

2014-02-21 12:07:46 +01:00

platform

remove void* parameter from platform::restart()

2014-02-21 12:18:11 +01:00

renderer

add texture settings

2014-02-19 18:14:42 +01:00

shader

refs #60: first cut of POI rendering

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

style

Merge branch 'master' into linux-wrapper

2014-02-21 12:26:16 +01:00

util

add timeouts for panning,scaling,rotating

2014-02-21 11:31:24 +01:00

llmr.hpp

glfw version of sample app

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