summaryrefslogtreecommitdiffstats
path: root/scilab/Makefile.incl.am
diff options
context:
space:
mode:
authorAntoine ELIAS <antoine.elias@scilab-enterprises.com>2016-11-13 12:04:44 +0100
committerAntoine ELIAS <antoine.elias@scilab-enterprises.com>2016-11-13 14:03:36 +0100
commitba0902ab6a77ca532086b5b4f27d67489be4b814 (patch)
tree3bdaf3c398f4f32dffb1fc14e017f8a98bd0a729 /scilab/Makefile.incl.am
parenta7015d45ff3ac2f10c1564d14fb0f6669478a806 (diff)
parenta53c2c4f46b1ea42d908b751310cb6bd92b7a870 (diff)
downloadscilab-windows.zip
scilab-windows.tar.gz
Merge remote-tracking branch 'origin/master' into windowswindows
Change-Id: I80edbceb67381ca1af2b19ef82ee08fc5b385909
Diffstat (limited to 'scilab/Makefile.incl.am')
-rw-r--r--scilab/Makefile.incl.am13
1 files changed, 8 insertions, 5 deletions
diff --git a/scilab/Makefile.incl.am b/scilab/Makefile.incl.am
index a3fc671..73e988b 100644
--- a/scilab/Makefile.incl.am
+++ b/scilab/Makefile.incl.am
@@ -3,11 +3,14 @@
3# Copyright (C) 2006-2008 - INRIA - Sylvestre LEDRU <sylvestre.ledru@inria.fr> 3# Copyright (C) 2006-2008 - INRIA - Sylvestre LEDRU <sylvestre.ledru@inria.fr>
4# Copyright (C) 2008 - INRIA - Pierre MARECHAL <pierre.marechal@inria.fr> 4# Copyright (C) 2008 - INRIA - Pierre MARECHAL <pierre.marechal@inria.fr>
5# 5#
6# This file must be used under the terms of the CeCILL. 6# Copyright (C) 2012 - 2016 - Scilab Enterprises
7# This source file is licensed as described in the file COPYING, which 7#
8# you should have received as part of this distribution. The terms 8# This file is hereby licensed under the terms of the GNU GPL v2.0,
9# are also available at 9# pursuant to article 5.3.4 of the CeCILL v.2.1.
10# http://www.cecill.info/licences/Licence_CeCILL_V2.1-en.txt 10# This file was originally licensed under the terms of the CeCILL v2.1,
11# and continues to be available under such terms.
12# For more information, see the COPYING file which you should have received
13# along with this program.
11# 14#
12 15
13########## 16##########