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

Conflicts:
	.gitignore
	src/rendering/renderablefov.cpp
	src/rendering/renderablepath.cpp
	src/scenegraph/scenegraph.cpp
	src/util/factorymanager.cpp

2014-12-08 21:26:38 -05:00

..

openspace

Merge branch 'develop' into solarsystem2

2014-12-08 21:26:38 -05:00