aboutsummaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorjthorn <jthorn@e296648e-0e4f-0410-bd07-d597d9acff87>2003-01-28 16:30:15 +0000
committerjthorn <jthorn@e296648e-0e4f-0410-bd07-d597d9acff87>2003-01-28 16:30:15 +0000
commit91f5c2052735d41398991164d360a255c23232f6 (patch)
tree5ffdf2aeead3e2a597a18d0acfe1388a2e8d61fe /README
parent17882d3fb8e2bf4ae620a1c2b2a826b2e69cd675 (diff)
merge copyright/license statements by Frank Loeffler and myself
(no change in semantics, just merging duplicate paragraphs) git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/Exact/trunk@151 e296648e-0e4f-0410-bd07-d597d9acff87
Diffstat (limited to 'README')
-rw-r--r--README31
1 files changed, 9 insertions, 22 deletions
diff --git a/README b/README
index dc8c6ba..ea59f71 100644
--- a/README
+++ b/README
@@ -31,22 +31,23 @@ Copyright
=========
As noted above, this code has been hacked on by many different people,
-so its' copyright status is somewhat unclear.
+so its' copyright and licensing status is somewhat unclear.
-Therefore here is a (incomplete) list of authors and their wishes:
+Here is a (incomplete) list of authors and their wishes:
-Jonathan Thornburg:
--------------------
+----------------------------------------
-However, the new code added in the June 2002 revisions is
-copyright (C) 2001-2002 by Jonathan Thornburg <jthorn@aei.mpg.de>.
+The new code added in the June 2002 revisions to this thorn
+ is copyright (C) 2001-2002 by Jonathan Thornburg <jthorn@aei.mpg.de>
+Minkowski_conf_wave and the conformal factor code added in January 2003
+ is copyright (C) 2003 by Frank Loeffler <frank.loeffler@aei.mpg.de>
-This new code is free software; you can redistribute it and/or modify
+This code is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-This new code is distributed in the hope that it will be useful, but
+This code is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@@ -56,18 +57,4 @@ along with this thorn (see the file COPYING in this directory);
if not, write to the Free Software Foundation, Inc., 59 Temple
Place, Suite 330, Boston, MA 02111-1307 USA
-Frank Loeffler (frank.loeffler@aei.mpg.de)
------------------------------------------
-
-Code added by myself (which is mainly Minkowski_conf_wave and the
-code using the conformal factor added in January 2003) is free
-software, you can redistribute it and/or modify it under the terms
-of the GNU General Public License as published bythe Free Software
-Foundation; either version 2 of the License, or(at your option)
-any later version.
-
-This new code is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-