end of revision for this file

[simgrid.git] / COPYING

diff --git a/COPYING b/COPYING
index 4f59b4b..be4700e 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -3,7 +3,7 @@ Upstream-Name: SimGrid
 Source: https://simgrid.org/
 
 Files: *
-Copyright: 2003-2018. The SimGrid Team. All rights reserved.
+Copyright: 2003-2019. The SimGrid Team. All rights reserved.
 License: LGPL-2.1
 
 Files: src/xbt/snprintf.c
@@ -14,7 +14,7 @@ Comment: Heavily adapted by the SimGrid team but remains under the original lice
 Files: src/xbt/mmalloc/* src/include/xbt/mmalloc.h
 Copyright: 
   Copyright (C) 1991, 1992 Free Software Foundation, Inc.
-  Copyright (C) 2003-2018. The SimGrid Team.
+  Copyright (C) 2003-2019. The SimGrid Team.
 License: LGPL-2.1
 Comment: these files used to be part of gdb, but were removed there
 
@@ -77,7 +77,7 @@ Files:
 Copyright:
  FleXML is Copyright (C) 1999-2005 Kristoffer Rose.  All rights reserved.
  FleXML is Copyright (C) 2003-2013 Martin Quinson.  All rights reserved.
- Copyright (C) 2003-2018. The SimGrid team.
+ Copyright (C) 2003-2019. The SimGrid team.
 License: GPL-2+ and LGPL-2.1
 Comment: Generated with the FleXML XML processor generator (which is GPL-2+) using SimGrid configuration files (that are LGPL-2.1)
 
@@ -181,10 +181,38 @@ License: other-reduce-rab
 Files: src/xbt/automaton/parserPromela.tab.cacc
 Copyright:
  Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
- Copyright (C) 2003-2018. The SimGrid team.
+ Copyright (C) 2003-2019. The SimGrid team.
 License: GPL-3+ and LGPL-2.1
 Comment: Generated with the Bison processor generator (which is GPL-3+) using SimGrid configuration files (that are LGPL-2.1) 
 
+Files: src/include/catch.hpp
+Copyright:
+  Copyright (c) 2018 Two Blue Cubes Ltd. 
+License: BSL-1.0
+
+License: BSL-1.0
+ Permission is hereby granted, free of charge, to any person or organization
+ obtaining a copy of the software and accompanying documentation covered by
+ this license (the "Software") to use, reproduce, display, distribute,
+ execute, and transmit the Software, and to prepare derivative works of the
+ Software, and to permit third-parties to whom the Software is furnished to
+ do so, all subject to the following:
+ .
+ The copyright notices in the Software and this entire statement, including
+ the above license grant, this restriction and the following disclaimer,
+ must be included in all copies of the Software, in whole or in part, and
+ all derivative works of the Software, unless such copies or derivative
+ works are solely in the form of machine-executable object code generated by
+ a source language processor.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
+
 Files: teshsuite/smpi/isp/umpire/*
 Copyright: 2000-2003, Bronis R. de Supinski
 Comment: this licensing info was provided by the author per email