Merge branch 'tmj-dev' into milek-dev

2026-03-22 15:05:03 +01:00 · 2018-09-16 22:48:53 +02:00
parent e938466c90 e881092ca0
commit d9687a4e1f
126 changed files with 40430 additions and 6134 deletions
--- a/EvLaunch.cpp
+++ b/EvLaunch.cpp
@@ -23,7 +23,6 @@ http://mozilla.org/MPL/2.0/.
 #include "Timer.h"
 #include "parser.h"
 #include "Console.h"
-#include "World.h"
 #include "simulationtime.h"
 #include "utilities.h"