Ignore:
Timestamp:
Feb 16, 2017 9:40:53 AM (7 years ago)
Author:
wojciech
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:
6a9559d
Parents:
dba6e57 (diff), 83d6249 (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:

Conflict resolved

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/Perspectives/__init__.py

    • Property mode changed from 100755 to 100644
    rf721030 r83d6249  
     1# Available perspectives. 
     2# When adding a new perspective, this dictionary needs to be updated 
     3 
     4from Fitting.FittingPerspective import FittingWindow 
     5from Invariant.InvariantPerspective import InvariantWindow 
     6 
     7PERSPECTIVES = { 
     8    FittingWindow.name: FittingWindow, 
     9    InvariantWindow.name: InvariantWindow, 
     10} 
Note: See TracChangeset for help on using the changeset viewer.