ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-3.0/LICENSE
(Generate patch)

Comparing trunk/OOPSE-3.0/LICENSE (file contents):
Revision 2196 by gezelter, Wed Oct 6 19:51:54 2004 UTC vs.
Revision 2197 by gezelter, Thu Apr 14 19:12:17 2005 UTC

# Line 7 | Line 7 | are met:
7  
8   1. Acknowledgement of the program authors must be made in any
9     publication of scientific results based in part on use of the
10 <   program.  An acceptable form of acknowledgement is citation of
11 <   the article in which the program was described (Matthew
12 <   A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher J. Fennel
13 <   and J. Daniel Gezelter, "OOPSE: The Object-Oriented Parallel
14 <   Simulation Engine," J. Comput. Chem. XX, XXXX-YYYY (2004)).
10 >   program.  An acceptable form of acknowledgement is citation of the
11 >   article in which the program was described (Matthew A. Meineke,
12 >   Charles F. Vardeman II, Teng Lin, Christopher J. Fennell and
13 >   J. Daniel Gezelter, "OOPSE: An Object-Oriented Parallel Simulation
14 >   Engine for Molecular Dynamics," J. Comput. Chem. 26, pp. 252-271
15 >   (2005))
16  
17   2. Redistributions of source code must retain the above copyright
18     notice, this list of conditions and the following disclaimer.
# Line 20 | Line 21 | This software is provided "AS IS," without a warranty
21     notice, this list of conditions and the following disclaimer in the
22     documentation and/or other materials provided with the distribution.
23  
24 < This software is provided "AS IS," without a warranty of any
25 < kind. ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND
26 < WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY,
27 < FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY
28 < EXCLUDED.  THE UNIVERSITY OF NOTRE DAME AND ITS LICENSORS SHALL NOT
29 < BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF
30 < USING, MODIFYING OR DISTRIBUTING THE SOFTWARE OR ITS
31 < DERIVATIVES. IN NO EVENT WILL THE UNIVERSITY OF NOTRE DAME OR ITS
32 < LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR
33 < DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE
34 < DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY,
35 < ARISING OUT OF THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF THE
36 < UNIVERSITY OF NOTRE DAME HAS BEEN ADVISED OF THE POSSIBILITY OF
36 < SUCH DAMAGES.
24 > This software is provided "AS IS," without a warranty of any kind. ALL
25 > EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
26 > INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
27 > PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.  THE
28 > UNIVERSITY OF NOTRE DAME AND ITS LICENSORS SHALL NOT BE LIABLE FOR ANY
29 > DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
30 > DISTRIBUTING THE SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL THE
31 > UNIVERSITY OF NOTRE DAME OR ITS LICENSORS BE LIABLE FOR ANY LOST
32 > REVENUE, PROFIT OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL,
33 > CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED AND
34 > REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF OR
35 > INABILITY TO USE SOFTWARE, EVEN IF THE UNIVERSITY OF NOTRE DAME HAS
36 > BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines