aboutsummaryrefslogtreecommitdiffstats
path: root/LICENSE
diff options
context:
space:
mode:
authorxleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e>2014-02-21 13:05:16 +0000
committerxleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e>2014-02-21 13:05:16 +0000
commit5af448143e8d548a8d73d8ed613156e331ca0e0b (patch)
tree6194eb9571ad10631ea6b451a345a37d5f9e02e2 /LICENSE
parent1f16929dbe62bb60ea391705c48d893fa6c997d9 (diff)
downloadcompcert-kvx-5af448143e8d548a8d73d8ed613156e331ca0e0b.tar.gz
compcert-kvx-5af448143e8d548a8d73d8ed613156e331ca0e0b.zip
Updates for release 2.2
git-svn-id: https://yquem.inria.fr/compcert/svn/compcert/trunk@2415 fca1b0fc-160b-0410-b1d3-a4f43f01ea2e
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE6
1 files changed, 3 insertions, 3 deletions
diff --git a/LICENSE b/LICENSE
index 3b41c108..567ef04e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,7 @@
All files in this distribution are part of the CompCert verified compiler.
The CompCert verified compiler is Copyright 2004, 2005, 2006, 2007,
-2008, 2009, 2010, 2011, 2012, 2013 Institut National de Recherche en
+2008, 2009, 2010, 2011, 2012, 2013, 2014 Institut National de Recherche en
Informatique et en Automatique (INRIA).
The CompCert verified compiler is distributed under the terms of the
@@ -60,13 +60,13 @@ Public License.
The files contained in the flocq/ directory and its subdirectories are
taken from the Flocq project, http://flocq.gforge.inria.fr/
-These files are Copyright 2010-2012 INRIA and distributed under the
+These files are Copyright 2010-2013 INRIA and distributed under the
terms of the GNU Lesser General Public Licence, either version 3 of
the licence, or (at your option) any later version. A copy of the GNU
Lesser General Public Licence version 3 is included below.
The files contained in the runtime/ directory and its subdirectories
-are Copyright 2013 INRIA and distributed under the terms of the BSD
+are Copyright 2013-2014 INRIA and distributed under the terms of the BSD
license, included below.
Finally, the following files are taken from the CIL library: