Update LICENSE to new version

This commit is contained in:
Dave Hickin
2016-07-22 15:33:20 +01:00
parent 0833d68e91
commit a227897504

109
LICENSE
View File

@@ -1,14 +1,16 @@
Copyright and License Terms
---------------------------
Copyright (c) 2006-2015 Martin R. Kraimer Copyright (c) 2006-2016 Martin R. Kraimer
Copyright (c) 2006 The University of Chicago, as Operator of Argonne Copyright (c) 2006-2016 UChicago Argonne LLC, as Operator of Argonne
National Laboratory. National Laboratory.
Copyright (c) 2006 Deutsches Elektronen-Synchrotron, Copyright (c) 2006 Deutsches Elektronen-Synchrotron,
Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY. Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY.
Copyright (c) 2007-2015 Control System Laboratory, Copyright (c) 2007-2016 Control System Laboratory,
(COSYLAB) Ljubljana Slovenia (COSYLAB) Ljubljana Slovenia
Copyright (c) 2010-2015 Brookhaven Science Associates, as Operator of Brookhaven Copyright (c) 2010-2016 Brookhaven Science Associates, as Operator
National Laboratory of Brookhaven National Laboratory
Copyright (c) 2011-2015 Diamond Light Source Limited, Copyright (c) 2011-2016 Diamond Light Source Limited,
(DLS) Didcot, United Kingdom (DLS) Didcot, United Kingdom
Permission is hereby granted, free of charge, to any person Permission is hereby granted, free of charge, to any person
@@ -34,81 +36,30 @@ OTHER DEALINGS IN THE SOFTWARE.
________________________________________________________________________ ________________________________________________________________________
This software is in part copyrighted by the University of Chicago (UofC) Additional Disclaimers
----------------------
In no event shall UofC be liable to any party for direct, indirect, This software is copyright in part by these institutions:
special, incidental, or consequential damages arising out of the use of
this software, its documentation, or any derivatives thereof, even if
UofC has been advised of the possibility of such damage.
UofC specifically disclaims any warranties, including, but not limited * Brookhaven Science Associates, as Operator of Brookhaven
to, the implied warranties of merchantability, fitness for a particular National Laboratory, New York, USA
purpose, and non-infringement. This software is provided on an "as is" * Control System Laboratory, Ljubljana, Slovenia
basis, and UofC has no obligation to provide maintenance, support, * Deutsches Elektronen-Synchroton, Member of the Helmholtz
updates, enhancements, or modifications. Association, Hamburg, Germany
* Diamond Light Source Limited, Didcot, United Kingdom
* Helmholtz-Zentrum Berlin fuer Materialien und Energie m.b.H.,
Berlin, Germany.
* UChicage Argonne LLC, as Operator of Argonne National Laboratory,
Illinois, USA
________________________________________________________________________ In no event shall these institutions be liable to any party for direct,
indirect, special, incidental, or consequential damages arising out of
the use of this software, its documentation, or any derivatives thereof,
even if advised of the possibility of such damage.
This software is in part copyrighted by the BERLINER SPEICHERRING These institutions specifically disclaim any warranties, including, but
GESELLSCHAFT FUER SYNCHROTRONSTRAHLUNG M.B.H. (BESSY), BERLIN, GERMANY. not limited to, the implied warranties of merchantability, fitness for a
particular purpose, and non-infringement. This software is provided on
In no event shall BESSY be liable to any party for direct, indirect, an "as is" basis, and these institutions have no obligation to provide
special, incidental, or consequential damages arising out of the use of maintenance, support, updates, enhancements, or modifications.
this software, its documentation, or any derivatives thereof, even if
BESSY has been advised of the possibility of such damage.
BESSY specifically disclaims any warranties, including, but not limited
to, the implied warranties of merchantability, fitness for a particular
purpose, and non-infringement. This software is provided on an "as is"
basis, and BESSY has no obligation to provide maintenance, support,
updates, enhancements, or modifications.
________________________________________________________________________
This software is in part copyrighted by the Deutsches Elektronen-Synchroton,
Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY.
In no event shall DESY be liable to any party for direct, indirect,
special, incidental, or consequential damages arising out of the use of
this software, its documentation, or any derivatives thereof, even if
DESY has been advised of the possibility of such damage.
DESY specifically disclaims any warranties, including, but not limited
to, the implied warranties of merchantability, fitness for a particular
purpose, and non-infringement. This software is provided on an "as is"
basis, and DESY has no obligation to provide maintenance, support,
updates, enhancements, or modifications.
______________________________________________________________________
This software is in part copyrighted by the Brookhaven
National Laboratory (BNL).
In no event shall BNL be liable to any party for direct, indirect,
special, incidental, or consequential damages arising out of the use of
this software, its documentation, or any derivatives thereof, even if
BNL has been advised of the possibility of such damage.
BNL specifically disclaims any warranties, including, but not limited
to, the implied warranties of merchantability, fitness for a particular
purpose, and non-infringement. This software is provided on an "as is"
basis, and BNL has no obligation to provide maintenance, support,
updates, enhancements, or modifications.
________________________________________________________________________
This software is in part copyrighted by Diamond Light Source Limited (DLS)
In no event shall DLS be liable to any party for direct, indirect,
special, incidental, or consequential damages arising out of the use of
this software, its documentation, or any derivatives thereof, even if
DLS has been advised of the possibility of such damage.
DLS specifically disclaims any warranties, including, but not limited
to, the implied warranties of merchantability, fitness for a particular
purpose, and non-infringement. This software is provided on an "as is"
basis, and DLS has no obligation to provide maintenance, support,
updates, enhancements, or modifications.
________________________________________________________________________