Changeset 6271222 in sasview for src/sas/guiframe/gui_manager.py

Timestamp:

Feb 19, 2015 11:16:39 AM (10 years ago)

Author:

smk78

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

8a22b5b

Parents:

aba7b40 (diff), 064723b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasview.git

File:

• src/sas/guiframe/gui_manager.py (modified) (1 diff)

src/sas/guiframe/gui_manager.py

@@ -1353 +1353 @@
         if config._do_acknowledge:
             self._help_menu.AppendSeparator()
+            id = wx.NewId()
             self._help_menu.Append(id, '&Acknowledge', 'Acknowledging SasView')
             wx.EVT_MENU(self, id, self._onAcknowledge)