1.1 --- a/COPYRIGHT	Sun Jun 20 09:30:12 2004 +0200
     1.2 +++ b/COPYRIGHT	Mon Jun 21 10:25:57 2004 +0200
     1.3 @@ -1,22 +1,35 @@
     1.4  ISABELLE COPYRIGHT NOTICE, LICENCE AND DISCLAIMER.
     1.5  
     1.6 -Copyright (C) 2003 by the University of Cambridge, Cambridge, UK and
     1.7 -                   by the Technical University of Munich, Munich, Germany.
     1.8 +Copyright (c) 2004,
     1.9 +  University of Cambridge and
    1.10 +  Technische Universitaet Muenchen.
    1.11  
    1.12 -Permission to use, copy, modify, and distribute this software and its
    1.13 -documentation for any non-commercial purpose and without fee is hereby
    1.14 -granted, provided that the above copyright notice appears in all copies and
    1.15 -that both the copyright notice and this permission notice and warranty
    1.16 -disclaimer appear in supporting documentation, and that the name of the
    1.17 -University of Cambridge or the Technical University of Munich not be used in
    1.18 -advertising or publicity pertaining to distribution of the software without
    1.19 -specific, written prior permission.
    1.20 +  All rights reserved.
    1.21  
    1.22 -The University of Cambridge and the Technical University of Munich disclaim
    1.23 -all warranties with regard to this software, including all implied warranties
    1.24 -of merchantability and fitness.  In no event shall the University of Cambridge
    1.25 -or the Technical University of Munich be liable for any special, indirect or
    1.26 -consequential damages or any damages whatsoever resulting from loss of use,
    1.27 -data or profits, whether in an action of contract, negligence or other
    1.28 -tortious action, arising out of or in connection with the use or performance
    1.29 -of this software.
    1.30 +Redistribution and use in source and binary forms, with or without 
    1.31 +modification, are permitted provided that the following conditions are 
    1.32 +met:
    1.33 +
    1.34 +* Redistributions of source code must retain the above copyright 
    1.35 +notice, this list of conditions and the following disclaimer.
    1.36 +
    1.37 +* Redistributions in binary form must reproduce the above copyright 
    1.38 +notice, this list of conditions and the following disclaimer in the 
    1.39 +documentation and/or other materials provided with the distribution.
    1.40 +
    1.41 +* Neither the name of the University of Cambridge or the Technical 
    1.42 +University of Munich nor the names of their contributors may be used to 
    1.43 +endorse or promote products derived from this software without specific 
    1.44 +prior written permission.
    1.45 +
    1.46 +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS 
    1.47 +IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 
    1.48 +TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
    1.49 +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
    1.50 +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
    1.51 +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
    1.52 +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
    1.53 +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
    1.54 +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
    1.55 +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
    1.56 +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.