Changeset 2a07053 in sasview for sasview/local_config.py


Ignore:
Timestamp:
Oct 6, 2016 6:40:04 PM (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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
5dd7499
Parents:
bf75f78 (diff), 06707b6 (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://www.github.com/sasview/sasview

File:
1 edited

Legend:

Unmodified
Added
Removed

  • sasview/local_config.py

    r8d3d20a r06707b6  
    4444'''This work benefited from the use of the SasView application, originally developed under NSF Award  
    4545DMR-0520547. SasView also contains code developed with funding from the EU Horizon 2020 research  
    46 and innovation programme under the SINE2020 project Grant No 654000.''' 
     46and innovation programme under the SINE2020 project Grant No 654000 and by Adam Washington.''' 
    4747 
    4848_acknowledgement =  \ 
    4949'''This work was originally developed as part of the DANSE project funded by the US NSF under Award DMR-0520547, but is currently maintained by a  
    5050collaboration between UTK, UMD, NIST, ORNL, ISIS, ESS, ILL and ANSTO. SasView also contains code developed with funding from the EU Horizon 2020  
    51 research and innovation programme under the SINE2020 project (Grant No 654000).''' 
     51research and innovation programme under the SINE2020 project (Grant No 654000) and by Adam Washington (corfunc-py).''' 
    5252 
    5353_homepage = "http://www.sasview.org" 
Note: See TracChangeset for help on using the changeset viewer.