Changeset f718919 in sasview for src/sas


Ignore:
Timestamp:
Mar 20, 2016 9:49:26 AM (8 years ago)
Author:
ajj
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:
66f21cd
Parents:
1ca0ac0 (diff), e2c22b5 (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:
3 added
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sasgui/guiframe/CategoryInstaller.py

    rd85c194 r1ca0ac0  
    176176            json.dump( master_category_dict, 
    177177                         open(serialized_file, 'wb') ) 
    178              
    179             try: 
    180                 #It happens only in source environment 
    181                 shutil.copyfile(serialized_file, default_file) 
    182             except: 
    183                 pass 
    184          
Note: See TracChangeset for help on using the changeset viewer.