summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e>2013-06-17 12:52:50 +0000
committerGravatar xleroy <xleroy@fca1b0fc-160b-0410-b1d3-a4f43f01ea2e>2013-06-17 12:52:50 +0000
commit1888e677c92d2edc2dda6eb7c27bea0a9906cc24 (patch)
treeb5407e0ee8a501d6499fa21b76e44260d0078d34
parent754ecb6217617ee3580922332edf97e41a3b5177 (diff)
Updating LICENSE and license headers, continued.
git-svn-id: https://yquem.inria.fr/compcert/svn/compcert/trunk@2281 fca1b0fc-160b-0410-b1d3-a4f43f01ea2e
-rw-r--r--LICENSE2
-rw-r--r--Makefile3
2 files changed, 5 insertions, 0 deletions
diff --git a/LICENSE b/LICENSE
index 1f8776d..3b41c10 100644
--- a/LICENSE
+++ b/LICENSE
@@ -49,6 +49,8 @@ option) any later version:
all files in the exportclight/ directory
+ Makefile
+
A copy of the GNU General Public License version 2 is included below.
The choice between the two licenses for the files listed above is left
to the user. If you opt for the GNU General Public License, these
diff --git a/Makefile b/Makefile
index 70f6013..76938b4 100644
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,9 @@
# #
# Copyright Institut National de Recherche en Informatique et en #
# Automatique. All rights reserved. This file is distributed #
+# 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 file is also distributed #
# under the terms of the INRIA Non-Commercial License Agreement. #
# #
#######################################################################