Changeset ec30905 in sasview for src/sas


Ignore:
Timestamp:
Jun 15, 2016 10:32:29 AM (9 years ago)
Author:
Gonzalez, Miguel <gonzalez@…>
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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
dceff6e
Parents:
b768e92 (diff), 91afd87 (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 ​https://github.com/SasView/sasview

Location:
src/sas
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed

  • src/sas/sascalc/dataloader/readers/defaults.json

    rb699768 r68aa210  
    99            "-extension":".ses", 
    1010            "-reader":"sesans_reader" 
     11         }, 
     12         { 
     13            "-extension":".h5", 
     14            "-reader":"cansas_reader_HDF5" 
    1115         }, 
    1216         { 

  • src/sas/sasgui/perspectives/fitting/models.py

    rcb4ef58 r6afc14b  
    147147    try: 
    148148        import compileall 
    149         compileall.compile_dir(dir=dir, ddir=dir, force=1, 
     149        compileall.compile_dir(dir=dir, ddir=dir, force=0, 
    150150                               quiet=report_problem) 
    151151    except: 
Note: See TracChangeset for help on using the changeset viewer.