Changeset 4f49f34 in sasview


Ignore:
Timestamp:
Apr 14, 2017 4:05:32 PM (8 months ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
master, ESS_GUI, ESS_GUI_CategroyManager, ESS_GUI_Pr, ESS_GUI_cns, ESS_GUI_corf, ESS_GUI_py2_OLD, SVCC-1, SasView-664, costrafo411, docs, ticket-873, ticket-976, unittest-saveload
Children:
04669d3
Parents:
2f22db9 (diff), 867aa79 (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' into SAS_OPENCL_856

Files:
2 added
1 edited

Legend:

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

    r38beeab r2f22db9  
    21292129                if "SAS_OPENCL" in line: 
    21302130                    if sas_opencl: 
    2131                         new_config_lines.append("SAS_OPENCL = \""+sas_opencl+"\"") 
     2131                        new_config_lines.append("SAS_OPENCL = \"" + sas_opencl 
     2132                                                + "\"\n") 
    21322133                    else: 
    2133                         new_config_lines.append("SAS_OPENCL = None") 
     2134                        new_config_lines.append("SAS_OPENCL = \"None\"\n") 
    21342135                else: 
    21352136                    new_config_lines.append(line) 
Note: See TracChangeset for help on using the changeset viewer.