X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=blobdiff_plain;f=COPYING;h=dddffe127ded8cb5974072599aaeb7641c571e4a;hb=07e8a2a25ab5a62f63af77fe0dd1405cd41ee5ce;hp=2bf46507345155c7bfef3f6167fca73458a7cab1;hpb=28bb38b9b5c10bff38e5e2fe0cd2b0c00433b382;p=alexxy%2Fgromacs.git

diff --git a/COPYING b/COPYING
index 2bf4650734..dddffe127d 100644
--- a/COPYING
+++ b/COPYING
@@ -11,16 +11,15 @@ This file contains the licenses for the following bodies of code:
 1. GROMACS
 2. Trajectory file reading using VMD plugins
 3. Internal FFT (fftpack)
-4. The memtestG80 library
-5. thread_mpi
-6. Blas
-7. Lapack
-8. Subset of Boost C++ library
-9. Google Test and Google Mock
-10. Sun XDR implementation (External Data Representation)
-11. Sun FDLIBM (Freely Distributable Maths Library)
-12. Random123
-13. md5
+4. thread_mpi
+5. Blas
+6. Lapack
+7. Subset of Boost C++ library
+8. Google Test and Google Mock
+9. Sun XDR implementation (External Data Representation)
+10. Sun FDLIBM (Freely Distributable Maths Library)
+11. Random123
+12. md5
 
 Our chosen method for packaging distributions (CPack) only permits a
 package to have a single license file, so we are unfortunately forced
@@ -964,37 +963,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 fftpack.c : A set of FFT routines in C.
 Algorithmically based on Fortran-77 FFTPACK by Paul N. Swarztrauber (Version 4, 1985).
 
-4. The memtestG80 library
-=========================
-
-   Files: src/gromacs/gmxlib/gpu_utils/memtestG80_core.*
-
-The memtestG80 library, written by Imran Haque, is Copyright 2009 Stanford University,
-covered by the LGPL license. It may be used under the following terms:
-
-IN NO EVENT SHALL STANFORD UNIVERSITY BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, 
-SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF
-THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF STANFORD UNIVERSITY HAS BEEN 
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-STANFORD UNIVERSITY SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED 
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 
-THE SOFTWARE AND ACCOMPANYING DOCUMENTATION PROVIDED HEREUNDER IS PROVIDED "AS IS". 
-Folding@home HAS NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, 
-OR MODIFICATIONS.
-
-Restrictions:
-
-You may use this software on a computer system only if you own the system or have the 
-written permission of the owner.
-
-You may not alter the software or associated data files. 
-
-Certain builds of this software incorporate by linkage code from the libintl
-and libiconv libraries, which are covered by the Library GNU Public License,
-available at http://www.gnu.org/licenses/lgpl-3.0.txt.
-
-5. thread_mpi
+4. thread_mpi
 =============
 
    Files: src/external/thread_mpi/
@@ -1030,7 +999,7 @@ bugs must be traceable. We will be happy to consider code for
 inclusion in the official distribution, but derived work should not
 be called official thread_mpi.
 
-6. Blas
+5. Blas
 =======
 
 These files are semi-automatic translations by f2c from the original netlib BLAS library.
@@ -1054,7 +1023,7 @@ better idea to use the full reference implementation.
 
 Erik Lindahl, 2008-10-07.
 
-7. Lapack
+6. Lapack
 =========
 
 These files are semi-automatic translations by f2c from the original netlib LAPACK library.
@@ -1079,7 +1048,7 @@ better idea to use the full reference implementation.
 
 Erik Lindahl, 2008-10-07.
 
-8. Subset of Boost C++ library
+7. Subset of Boost C++ library
 ==============================
 
    Files: src/external/boost/boost/*
@@ -1108,7 +1077,7 @@ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 
-9. Google Test and Google Mock
+8. Google Test and Google Mock
 ===============================
 
    Files: src/external/gmock-1.7.0/*
@@ -1143,7 +1112,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-10. Sun Extensible Data Representation routines (XDR)
+9. Sun Extensible Data Representation routines (XDR)
 =====================================================
 
     Files: src/gromacs/fileio/gmx_system_xdr.c
@@ -1176,7 +1145,7 @@ Sun Microsystems, Inc.
 Mountain View, California  94043
 
 
-11. Sun FDLIBM (Freely Distributable Maths Library)
+10. Sun FDLIBM (Freely Distributable Maths Library)
 ===================================================
 
     Files: src/gromacs/math/utilities.c
@@ -1189,7 +1158,7 @@ software is freely granted, provided that this notice
 is preserved.
 
 
-12. Random123
+11. Random123
 ============================================
 
 Copyright 2010-2012, D. E. Shaw Research.
@@ -1223,7 +1192,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-13. md5
+12. md5
 ============================================
 
 Copyright (C) 1999, 2002 Aladdin Enterprises.  All rights reserved.