aboutsummaryrefslogtreecommitdiffstats
path: root/LICENSE
diff options
context:
space:
mode:
authorBernhard Schommer <bernhardschommer@gmail.com>2015-06-17 18:53:39 +0200
committerBernhard Schommer <bernhardschommer@gmail.com>2015-06-17 18:53:39 +0200
commitb51cc596555dae929e75e4a02520f01d6f53978d (patch)
tree7a43ce306cb641b85dab43e88ed757edb873eed2 /LICENSE
parente503983cdc99c6038ada0d0b94f32f02d13210c8 (diff)
parent0e9ededa8c1d194453f5113bf57c93d0803f03b1 (diff)
downloadcompcert-b51cc596555dae929e75e4a02520f01d6f53978d.tar.gz
compcert-b51cc596555dae929e75e4a02520f01d6f53978d.zip
Merge branch 'master' into json_export
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE4
1 files changed, 2 insertions, 2 deletions
diff --git a/LICENSE b/LICENSE
index 9887738b..21670791 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,8 +1,8 @@
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, 2014 Institut National de Recherche en
-Informatique et en Automatique (INRIA).
+2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Institut National de
+Recherche en Informatique et en Automatique (INRIA).
The CompCert verified compiler is distributed under the terms of the
INRIA Non-Commercial License Agreement given below. This is a