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/mainFrame.py
+++ b/gui/mainFrame.py
@@ -612,7 +612,9 @@ class MainFrame(wx.Frame):
                (wx.ACCEL_CTRL, wx.WXK_PAGEDOWN, ctabnext),
                (wx.ACCEL_CTRL, wx.WXK_PAGEUP, ctabprev),
                (wx.ACCEL_CMD, wx.WXK_PAGEDOWN, ctabnext),
-                (wx.ACCEL_CMD, wx.WXK_PAGEUP, ctabprev)
+                (wx.ACCEL_CMD, wx.WXK_PAGEUP, ctabprev),
+
+                (wx.ACCEL_CMD | wx.ACCEL_SHIFT, ord("Z"), wx.ID_REDO)
                ]

        # Ctrl/Cmd+# for addition pane selection