Alexander Bock ae6ade497b Merge branch 'feature/render-bins' into feature/rosetta ...

Conflicts:
	data/scene/earth/earth.mod
	include/openspace/util/updatestructures.h
	modules/base/shaders/ephemeris_fs.glsl
	modules/base/shaders/plane_fs.glsl

2016-08-29 15:53:59 +02:00

3.0 KiB

Raw Blame History

View Raw