Changeset be2775f in sasview for src/sas/sasgui


Ignore:
Timestamp:
Mar 21, 2016 4:37:11 PM (9 years ago)
Author:
gonzalezm
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:
70e5f97
Parents:
d85b0c7 (diff), a8787f9 (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/sasgui
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • src/sas/sasgui/guiframe/data_processor.py

    rdc2da3d r74c5521  
    1212#Path to this is:           /sasview/src/sas/sasgui/guiframe/data_processor.py 
    1313#Path to image is:          /sasview/src/sas/sasgui/guiframe/media/BatchGridClassLayout.png 
    14 .. image::  ./guiframe/media/BatchGridClassLayout.png 
    15    :align:   center 
     14 
     15.. image:: ./guiframe/media/BatchGridClassLayout.png 
     16   :align: center 
    1617 
    1718""" 

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

    r08959b8 rd85b0c7  
    151151    try: 
    152152        import compileall 
    153         compileall.compile_dir(dir=dir, ddir=dir, force=1, 
     153        compileall.compile_dir(dir=dir, ddir=dir, force=0, 
    154154                               quiet=report_problem) 
    155155    except: 
Note: See TracChangeset for help on using the changeset viewer.