Merge branch 'ammo_graph' into singularity

# Conflicts: # gui/targetProfileEditor.py
2020-06-09 19:04:20 +03:00
parent 7eaeea325d aec5a46452
commit 27d3bea8d8
28 changed files with 582 additions and 232 deletions
--- a/gui/errorDialog.py
+++ b/gui/errorDialog.py
@@ -26,7 +26,7 @@ import wx
 from logbook import Logger

 import config
-from gui.auxFrame import AuxiliaryFrame
+from gui.auxWindow import AuxiliaryFrame
 from service.prereqsCheck import version_block