Ignore:
Timestamp:
Jun 27, 2016 12:42:47 PM (8 years ago)
Author:
Paul Kienzle <pkienzle@…>
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:
646b896, 5552396
Parents:
6ed67db (diff), 9501661 (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 github.com:sasview/sasview

File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/sas/sasgui/perspectives/calculator/model_editor.py

    rd7573c7 r9501661  
    14511451 
    14521452    def _set_dispersion(self): 
    1453         self.dispersion = {} 
     1453        self.dispersion = collections.OrderedDict() 
    14541454        ##set dispersion only from p_model 
    14551455        for name , value in self.p_model1.dispersion.iteritems(): 
Note: See TracChangeset for help on using the changeset viewer.