summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorChris Dyer <redpony@gmail.com>2009-12-08 21:38:55 -0500
committerChris Dyer <redpony@gmail.com>2009-12-08 21:38:55 -0500
commitdc6930c00b4b276883280cff1ed6dcd9ddef03c7 (patch)
treed76d25baf66459d13da4faedffd7d6faba28a513 /README
parent5082307f382a6563d4ffb97034137da4e362e629 (diff)
LICENSE fixes, full support of lattice decoding
Diffstat (limited to 'README')
-rw-r--r--README19
1 files changed, 3 insertions, 16 deletions
diff --git a/README b/README
index 58f13b74..29a70c9c 100644
--- a/README
+++ b/README
@@ -50,19 +50,6 @@ COPYRIGHT AND LICENSE
------------------------------------------------------------------------------
Copyright (c) 2009 by Chris Dyer <redpony@gmail.com>
-Licensed under the Apache License, Version 2.0 (the "License"); you may
-not use this file except in compliance with the License. You may obtain
-a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-The LBFGS implementation contains code from the Computational
-Crystallography Toolbox which is copyright (c) 2006 by The Regents of the
-University of California, through Lawrence Berkeley National Laboratory.
-For more information on their license, refer to http://cctbx.sourceforge.net/
+See the file LICENSE.txt for the licensing terms that this software is
+released under.
+