Changeset 98f6916 in sasview

Timestamp:

Feb 19, 2015 6:10:29 AM (10 years ago)

Author:

smk78

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:

bc9a0e1

Message:

License text updated to remove reference to SourceForge? and replace with
GitHub?.

Opportunity also taken to add Diamond and Delft as contributors, and to
extend copyright to present.

File:

• sasview/license.txt (modified) (1 diff)

sasview/license.txt

@@ -2 +2 @@
 as part of the Distributed Data Analysis of Neutron Scattering 
 Experiments (DANSE) project funded by the US National Science Foundation
-and is currently being developed as an open source project hosted at SourceForge
-and managed by a consortium of scattering facilities.  Participating facilities
-include: The University of Maryland, The European Spallation Source, ISIS, The Institut Laue Langevin, 
-The National Institute of Standards and Technology Center for Neutron Research 
-and the Oak Ridge National Laboratory Neutron Sciences Directorate.
+and is currently being developed as an open source project hosted on GitHub
+and managed by a consortium of scattering facilities.
+
+Participating facilities include: the University of Tennessee, the University 
+of Maryland, the European Spallation Source, the National Institute of 
+Standards & Technology Center for Neutron Research, the Oak Ridge National 
+Laboratory Neutron Sciences Directorate, the ISIS Neutron & Muon Source, the 
+Institut Laue Langevin, the Diamond Light Source, and Delft University of 
+Technology.
 
 If you use this application to do scientific research that leads to publication, 
-we ask that you acknowledge the use of the software with the following sentence:
+we kindly ask that you acknowledge the use of the software with the following 
+sentence:
 
-"This work benefited from the use of the SasView application, originally developed under NSF award DMR-0520547." 
+*"This work benefited from the use of the SasView application, originally 
+developed under NSF award DMR-0520547."*
 
-copyright 2009-2011, UTK, UMD, NIST, ORNL, ISIS, ESS, and ILL
+(C) 2009-2015 UTK, UMD, ESS, NIST, ORNL, ISIS, ILL, DLS, DUT