Skip to content

Commit 534fa92

Browse files
committed
Update LICENSE to new version
1 parent 13737a4 commit 534fa92

1 file changed

Lines changed: 38 additions & 12 deletions

File tree

normativeTypesJava/LICENSE

Lines changed: 38 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
1+
Copyright and License Terms
2+
---------------------------
13

2-
Copyright (c) 2015 Diamond Light Source Ltd.
4+
Copyright (c) 2006-2016 Martin R. Kraimer
5+
Copyright (c) 2006-2016 UChicago Argonne LLC, as Operator of Argonne
6+
National Laboratory.
7+
Copyright (c) 2006 Deutsches Elektronen-Synchrotron,
8+
Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY.
9+
Copyright (c) 2007-2016 Control System Laboratory,
10+
(COSYLAB) Ljubljana Slovenia
11+
Copyright (c) 2010-2016 Brookhaven Science Associates, as Operator
12+
of Brookhaven National Laboratory
13+
Copyright (c) 2011-2016 Diamond Light Source Limited,
14+
(DLS) Didcot, United Kingdom
315

416
Permission is hereby granted, free of charge, to any person
517
obtaining a copy of this software and associated documentation
@@ -24,16 +36,30 @@ OTHER DEALINGS IN THE SOFTWARE.
2436

2537
________________________________________________________________________
2638

27-
This software is in part copyrighted by Diamond Light Source Ltd. (DLS)
39+
Additional Disclaimers
40+
----------------------
2841

29-
In no event shall DLS be liable to any party for direct, indirect,
30-
special, incidental, or consequential damages arising out of the use of
31-
this software, its documentation, or any derivatives thereof, even if
32-
DLS has been advised of the possibility of such damage.
42+
This software is copyright in part by these institutions:
43+
44+
* Brookhaven Science Associates, as Operator of Brookhaven
45+
National Laboratory, New York, USA
46+
* Control System Laboratory, Ljubljana, Slovenia
47+
* Deutsches Elektronen-Synchroton, Member of the Helmholtz
48+
Association, Hamburg, Germany
49+
* Diamond Light Source Limited, Didcot, United Kingdom
50+
* Helmholtz-Zentrum Berlin fuer Materialien und Energie m.b.H.,
51+
Berlin, Germany.
52+
* UChicage Argonne LLC, as Operator of Argonne National Laboratory,
53+
Illinois, USA
54+
55+
In no event shall these institutions be liable to any party for direct,
56+
indirect, special, incidental, or consequential damages arising out of
57+
the use of this software, its documentation, or any derivatives thereof,
58+
even if advised of the possibility of such damage.
59+
60+
These institutions specifically disclaim any warranties, including, but
61+
not limited to, the implied warranties of merchantability, fitness for a
62+
particular purpose, and non-infringement. This software is provided on
63+
an "as is" basis, and these institutions have no obligation to provide
64+
maintenance, support, updates, enhancements, or modifications.
3365

34-
DLS specifically disclaims any warranties, including, but not limited
35-
to, the implied warranties of merchantability, fitness for a particular
36-
purpose, and non-infringement. This software is provided on an "as is"
37-
basis, and DLS has no obligation to provide maintenance, support,
38-
updates, enhancements, or modifications.
39-
________________________________________________________________________

0 commit comments

Comments
 (0)