Michal Marcinkowski f032b4e3b0 Merge branch 'develop' into solarsystem2 ...

Conflicts:
	.gitignore
	include/openspace/rendering/renderablefov.h
	src/CMakeLists.txt
	src/rendering/model/renderablemodel.cpp
	src/rendering/renderablefov.cpp
	src/rendering/renderablepath.cpp
	src/rendering/renderabletrail.cpp
	src/util/factorymanager.cpp

2014-12-15 13:23:30 -05:00

..

openspace

Merge branch 'develop' into solarsystem2

2014-12-15 13:23:30 -05:00