Changeset a3b7542 in sasview

Timestamp:

Dec 19, 2018 4:54:45 AM (6 years ago)

Author:

wojciech

Branches:

ESS_GUI, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_sync_sascalc

Children:

1c98850

Parents:

14673d52 (diff), 59b925c1 (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.

git-author:

Wojtek Potrzebowski <wojciech.potrzebowski@…> (12/19/18 04:54:10)

git-committer:

Wojtek Potrzebowski <wojciech.potrzebowski@…> (12/19/18 04:54:45)

Message:

conflicts resolved

File:

• src/sas/qtgui/Utilities/TabbedModelEditor.py (modified) (1 diff)

src/sas/qtgui/Utilities/TabbedModelEditor.py

@@ -88 +88 @@
     def saveClose(self):
         """
-        Checking if files is subject of saving before cloasing or reloading or reloading model
+        Check if file needs saving before closing or model reloading
         """
         saveCancelled = False