Merge tag 'v2.22.1' into i18n

# Conflicts: # gui/esiFittings.py
2020-06-19 21:51:45 -04:00
parent 7fa638f62b 31cae0e54b
commit 8e83adf7db
3341 changed files with 94537 additions and 76344 deletions
--- a/gui/patternEditor.py
+++ b/gui/patternEditor.py
@@ -21,7 +21,7 @@
 import wx
 from logbook import Logger

-from gui.auxFrame import AuxiliaryFrame
+from gui.auxWindow import AuxiliaryFrame
 from gui.bitmap_loader import BitmapLoader
 from gui.builtinViews.entityEditor import BaseValidator, EntityEditor
 from gui.utils.clipboard import fromClipboard, toClipboard