Alexander Bock 50fd9309ba Merge branch 'master' into feature/NewAtmosphere ...

# Conflicts:
#	src/rendering/renderengine.cpp

2017-10-24 15:30:22 -04:00

..

planetgeometry.cpp

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

planetgeometry.h

Fix byte order mark commits

2017-07-17 15:54:00 -04:00

renderableconstellationbounds.cpp

Make RenderableConstellationBounds not crash if the file is missing

2017-10-21 10:27:14 -04:00

renderableconstellationbounds.h

Clean up digitaluniverse data folder

2017-10-17 21:36:54 -04:00

renderableplanet.cpp

Merged master into atm.

2017-08-16 12:00:28 -04:00

renderableplanet.h

Merged master into atm.

2017-08-16 12:00:28 -04:00

renderablerings.cpp

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

renderablerings.h

Remove return values from initialize and deinitialize functions

2017-07-28 17:51:25 -04:00

renderablestars.cpp

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00

renderablestars.h

Remove return values from initialize and deinitialize functions

2017-07-28 17:51:25 -04:00

simplespheregeometry.cpp

Merged master into atm.

2017-08-16 12:00:28 -04:00

simplespheregeometry.h

Feature/cmake cleanup (#381)

2017-08-14 09:38:32 -04:00