summaryrefslogtreecommitdiffstats
path: root/scilab/COPYING-BSD
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/COPYING-BSD
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/COPYING-BSD')
-rw-r--r--scilab/COPYING-BSD8
1 files changed, 7 insertions, 1 deletions
diff --git a/scilab/COPYING-BSD b/scilab/COPYING-BSD
index 529b82f..740117f 100644
--- a/scilab/COPYING-BSD
+++ b/scilab/COPYING-BSD
@@ -1,7 +1,13 @@
1
2Some files in Scilab are licensed under the BSD License below, in particular
3examples, which you can reuse freely.
4
5===
6
1This is the BSD license (3-clause license "New BSD License") 7This is the BSD license (3-clause license "New BSD License")
2This license is used in most of the demos and examples provided with Scilab. 8This license is used in most of the demos and examples provided with Scilab.
3 9
4Copyright (c) 2011-2015 Scilab Enterprises 10Copyright (c) 2011-2016 Scilab Enterprises
5Copyright (c) 2008-2012 DIGITEO 11Copyright (c) 2008-2012 DIGITEO
6Copyright (c) 1989-2012 INRIA 12Copyright (c) 1989-2012 INRIA
7 13