aboutsummaryrefslogtreecommitdiff
path: root/COPYING
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2011-03-02 19:09:54 +0100
committerThomas White <taw@physics.org>2012-02-22 15:27:16 +0100
commited81cc8d9811aeb93c286266a464fea25554a083 (patch)
tree4f3d3e0c14081fca4a131c30524551ec87278f9e /COPYING
parentd801fac508e3354d9aa2c86966c7c504e4bec65c (diff)
Update docs
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING13
1 files changed, 12 insertions, 1 deletions
diff --git a/COPYING b/COPYING
index a459ee65..dfdf2494 100644
--- a/COPYING
+++ b/COPYING
@@ -1 +1,12 @@
-(c) 2006 Thomas White <taw27@cam.ac.uk>
+(c) 2005-2011 Thomas White <taw@physics.org>
+
+
+CrystFEL is free software, which means you can redistribute it and/or modify it
+under the terms of the GNU General Public License.
+
+The GNU General Public License does not permit this software to be redistributed
+in proprietary programs.
+
+CrystFEL 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.