Changeset 3c6ecd9 in sasview for src/sas/sasgui

Timestamp:

May 7, 2018 6:47:21 AM (7 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

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

Children:

42787fb

Parents:

b0ba43e (diff), 80468f6 (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 'ESS_GUI' into ESS_GUI_Pr

Location:

src/sas/sasgui

Files:

• guiframe/CategoryManager.py (modified) (1 diff)
• perspectives/calculator/media/.DS_Store (deleted)
• perspectives/corfunc/corfunc_panel.py (modified) (1 prop)

src/sas/sasgui/guiframe/CategoryManager.py

@@ -340 +340 @@
         from documentation_window import DocumentationWindow
 
-        _TreeLocation = "user/sasgui/perspectives/fitting/fitting_help.html"
+        _TreeLocation = "user/qtgui/Perspectives/Fitting/fitting_help.html"
         _PageAnchor = "#category-manager"
         _doc_viewer = DocumentationWindow(self, -1, _TreeLocation, _PageAnchor,