diff --git a/COPYRIGHT b/COPYRIGHT index 8ae1591..1461f72 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -15,7 +15,7 @@ provided on an "as is" basis, and the copyright holders have no obligation either collectively or individually to provide maintenance, support, updates, enhancements, or modifications. -Copyright (c) 2006 - 2015 +Copyright (c) 2006 - 2015 All rights reserved Martin R. Kraimer The University of Chicago, as Operator of Argonne National Laboratory. @@ -23,7 +23,9 @@ Deutsches Elektronen-Synchroton, Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY, BERLINER SPEICHERRING GESELLSCHAFT FUER SYNCHROTRONSTRAHLUNG M.B.H. (BESSY), BERLIN, GERMANY. -COSYLAB (Control System Laboratory), Ljubljana Slovenia +COSYLAB (Control System Laboratory), Ljubljana, Slovenia. Brookhaven Science Associates, as Operator of Brookhaven National Laboratory. -Diamond Light Source Ltd. +Diamond Light Source Ltd., Didcot, United Kingdom. + + diff --git a/LICENSE b/LICENSE index 3f43ff2..eca704e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,12 +1,15 @@ -Copyright (c) 2008 Martin R. Kraimer +Copyright (c) 2006-2015 Martin R. Kraimer Copyright (c) 2006 The University of Chicago, as Operator of Argonne National Laboratory. Copyright (c) 2006 Deutsches Elektronen-Synchrotron, Member of the Helmholtz Association, (DESY), HAMBURG, GERMANY. -Copyright (c) 2007 Control System Laboratory, +Copyright (c) 2007-2015 Control System Laboratory, (COSYLAB) Ljubljana Slovenia - +Copyright (c) 2010-2015 Brookhaven Science Associates, as Operator of Brookhaven + National Laboratory +Copyright (c) 2011-2015 Diamond Light Source Limited, + (DLS) Didcot, United Kingdom Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation @@ -75,4 +78,37 @@ 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. + +________________________________________________________________________ + diff --git a/src/nt/ntaggregate.cpp b/src/nt/ntaggregate.cpp index 20fc498..4f9e4a1 100644 --- a/src/nt/ntaggregate.cpp +++ b/src/nt/ntaggregate.cpp @@ -1,7 +1,7 @@ /* ntaggregate.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ diff --git a/src/nt/ntaggregate.h b/src/nt/ntaggregate.h index 70405bf..8ff4e0d 100644 --- a/src/nt/ntaggregate.h +++ b/src/nt/ntaggregate.h @@ -1,7 +1,7 @@ /* ntaggregate.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ #ifndef NTAGGREGATE_H diff --git a/src/nt/ntattribute.cpp b/src/nt/ntattribute.cpp index 64daffd..895ae94 100644 --- a/src/nt/ntattribute.cpp +++ b/src/nt/ntattribute.cpp @@ -1,7 +1,7 @@ /* ntattribute.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ diff --git a/src/nt/ntattribute.h b/src/nt/ntattribute.h index efebcc2..9f1cc35 100644 --- a/src/nt/ntattribute.h +++ b/src/nt/ntattribute.h @@ -1,7 +1,7 @@ /* ntattribute.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ #ifndef NTATTRIBUTE_H diff --git a/src/nt/ntcontinuum.cpp b/src/nt/ntcontinuum.cpp index 5eb2866..a0ac9f4 100644 --- a/src/nt/ntcontinuum.cpp +++ b/src/nt/ntcontinuum.cpp @@ -1,7 +1,7 @@ /* ntcontinuum.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ diff --git a/src/nt/ntcontinuum.h b/src/nt/ntcontinuum.h index 500e0ac..e1dced1 100644 --- a/src/nt/ntcontinuum.h +++ b/src/nt/ntcontinuum.h @@ -1,7 +1,7 @@ /* ntcontinuum.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ #ifndef NTCONTINUUM_H diff --git a/src/nt/ntenum.cpp b/src/nt/ntenum.cpp index 967573b..edcfa08 100644 --- a/src/nt/ntenum.cpp +++ b/src/nt/ntenum.cpp @@ -1,7 +1,7 @@ /* ntenum.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ diff --git a/src/nt/ntenum.h b/src/nt/ntenum.h index 380cda8..f3fad60 100644 --- a/src/nt/ntenum.h +++ b/src/nt/ntenum.h @@ -1,7 +1,7 @@ /* ntenum.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ #ifndef NTENUM_H diff --git a/src/nt/nthistogram.cpp b/src/nt/nthistogram.cpp index 301c04a..7f9bb79 100644 --- a/src/nt/nthistogram.cpp +++ b/src/nt/nthistogram.cpp @@ -1,7 +1,7 @@ /* ntcontinuum.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ diff --git a/src/nt/nthistogram.h b/src/nt/nthistogram.h index db67ad9..87ab65e 100644 --- a/src/nt/nthistogram.h +++ b/src/nt/nthistogram.h @@ -1,7 +1,7 @@ /* nthistogram.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ #ifndef NTHISTOGRAM_H diff --git a/src/nt/ntid.cpp b/src/nt/ntid.cpp index 5649051..4a5013b 100644 --- a/src/nt/ntid.cpp +++ b/src/nt/ntid.cpp @@ -1,6 +1,6 @@ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS JavaIOC is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ diff --git a/src/nt/ntid.h b/src/nt/ntid.h index 662ec21..842ce5c 100644 --- a/src/nt/ntid.h +++ b/src/nt/ntid.h @@ -1,6 +1,6 @@ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS JavaIOC is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ #ifndef NTID_H diff --git a/src/nt/ntmatrix.cpp b/src/nt/ntmatrix.cpp index a809946..0bb3037 100644 --- a/src/nt/ntmatrix.cpp +++ b/src/nt/ntmatrix.cpp @@ -1,7 +1,7 @@ /* ntmatrix.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ diff --git a/src/nt/ntmatrix.h b/src/nt/ntmatrix.h index f078c81..c6c12c9 100644 --- a/src/nt/ntmatrix.h +++ b/src/nt/ntmatrix.h @@ -1,7 +1,7 @@ /* ntmatrix.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ #ifndef NTMATRIX_H diff --git a/src/nt/ntndarrayAttribute.cpp b/src/nt/ntndarrayAttribute.cpp index 72380c5..b8e6900 100644 --- a/src/nt/ntndarrayAttribute.cpp +++ b/src/nt/ntndarrayAttribute.cpp @@ -1,7 +1,7 @@ /* ntndarrayAttribute.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ diff --git a/src/nt/ntndarrayAttribute.h b/src/nt/ntndarrayAttribute.h index b5867c0..cd3abab 100644 --- a/src/nt/ntndarrayAttribute.h +++ b/src/nt/ntndarrayAttribute.h @@ -1,7 +1,7 @@ /* ntndarrayAttribute.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ #ifndef NTNDARRAYATTRIBUTE_H diff --git a/src/nt/ntscalarMultiChannel.cpp b/src/nt/ntscalarMultiChannel.cpp index 42ae5f6..922eba1 100644 --- a/src/nt/ntscalarMultiChannel.cpp +++ b/src/nt/ntscalarMultiChannel.cpp @@ -1,7 +1,7 @@ /* ntscalarMultiChannel.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ diff --git a/src/nt/ntscalarMultiChannel.h b/src/nt/ntscalarMultiChannel.h index 3cd0a7f..d0f6f67 100644 --- a/src/nt/ntscalarMultiChannel.h +++ b/src/nt/ntscalarMultiChannel.h @@ -1,7 +1,7 @@ /* ntscalarMultiChannel.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ #ifndef NTSCALARMULTICHANNEL_H diff --git a/src/nt/ntunion.cpp b/src/nt/ntunion.cpp index a4277b1..81890bc 100644 --- a/src/nt/ntunion.cpp +++ b/src/nt/ntunion.cpp @@ -1,7 +1,7 @@ /* ntunion.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ diff --git a/src/nt/ntunion.h b/src/nt/ntunion.h index 4aa7f1e..3234bfc 100644 --- a/src/nt/ntunion.h +++ b/src/nt/ntunion.h @@ -1,7 +1,7 @@ /* ntunion.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ #ifndef NTUNION_H diff --git a/src/nt/nturi.cpp b/src/nt/nturi.cpp index 1d0d824..bcdddec 100644 --- a/src/nt/nturi.cpp +++ b/src/nt/nturi.cpp @@ -1,7 +1,7 @@ /* nturi.cpp */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ diff --git a/src/nt/nturi.h b/src/nt/nturi.h index 20f51f5..7bc6a44 100644 --- a/src/nt/nturi.h +++ b/src/nt/nturi.h @@ -1,7 +1,7 @@ /* nturi.h */ /** * Copyright - See the COPYRIGHT that is included with this distribution. - * EPICS pvDataCPP is distributed subject to a Software License Agreement found + * This software is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. */ #ifndef NTURI_H