Merge branch 'tmj-dev' into milek-dev

2026-03-22 15:05:03 +01:00 · 2019-04-05 19:26:42 +02:00
parent c17e737abb a081077c2f
commit d8b2c68653
21 changed files with 576 additions and 198 deletions
--- a/PyInt.cpp
+++ b/PyInt.cpp
@@ -10,9 +10,8 @@ http://mozilla.org/MPL/2.0/.
 #include "stdafx.h"
 #include "PyInt.h"

-#include "Globals.h"
+#include "dictionary.h"
 #include "application.h"
-#include "renderer.h"
 #include "Logs.h"

 #ifdef __GNUC__