Merge branch 'test-3' into esi

# Conflicts: # requirements.txt
2018-02-11 23:17:50 -05:00
parent 7b0f672f04 5f0ce58c29
commit 33eccaa374
18 changed files with 109 additions and 112 deletions
--- a/gui/mainFrame.py
+++ b/gui/mainFrame.py
@@ -242,8 +242,8 @@ class MainFrame(wx.Frame):
        self.titleTimer = wx.Timer(self)
        self.Bind(wx.EVT_TIMER, self.updateTitle, self.titleTimer)

-    def ShowUpdateBox(self, release):
-        dlg = UpdateDialog(self, release)
+    def ShowUpdateBox(self, release, version):
+        dlg = UpdateDialog(self, release, version)
        dlg.ShowModal()

    def LoadPreviousOpenFits(self):