Merge branch 'master' into gfx-work

2026-07-19 19:09:20 +02:00 · 2018-09-20 19:14:28 +02:00
parent 0453e10534 d9687a4e1f
commit 7c6501bb07
114 changed files with 9353 additions and 6114 deletions
--- a/sun.cpp
+++ b/sun.cpp
@@ -2,7 +2,6 @@
 #include "sun.h"
 #include "Globals.h"
 #include "mtable.h"
-#include "World.h"
 #include "utilities.h"
 #include "simulationtime.h"