Merge branch 'tmj-dev' into milek-dev

2026-03-22 15:05:03 +01:00 · 2018-10-12 23:13:51 +02:00
parent 2a00d52525 68f82be451
commit c7741c6618
32 changed files with 27 additions and 1514 deletions
--- a/drivermouseinput.cpp
+++ b/drivermouseinput.cpp
@@ -13,13 +13,14 @@ http://mozilla.org/MPL/2.0/.
 #include "Globals.h"
 #include "application.h"
 #include "utilities.h"
+#include "Globals.h"
+#include "Timer.h"
 #include "simulation.h"
 #include "Train.h"
 #include "AnimModel.h"
 #include "renderer.h"
 #include "uilayer.h"
 #include "Logs.h"
-#include "Timer.h"

 void
 mouse_slider::bind( user_command const &Command ) {