Changeset 2de23521 in sasview for src/sas/sasgui

Timestamp:

Mar 28, 2017 4:57:31 AM (8 years ago)

Author:

GitHub <noreply@…>

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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

7cbbacd, 4c5098c

Parents:

9146ed9 (diff), 8434365 (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:

Andrew Jackson <andrew.jackson@…> (03/28/17 04:57:31)

git-committer:

GitHub <noreply@…> (03/28/17 04:57:31)

Message:

Merge pull request #56 from SasView?/rc_4_1_issues

Release: Save state and test data

File:

• src/sas/sasgui/perspectives/fitting/pagestate.py (modified) (1 diff)

src/sas/sasgui/perspectives/fitting/pagestate.py

@@ -819 +819 @@
 
         attr = newdoc.createAttribute("version")
-        import sasview
+        from sas import sasview
         attr.nodeValue = sasview.__version__
         # attr.nodeValue = '1.0'