Differences

This shows you the differences between two versions of the page.

--- public:cadia-clause:bsd [2009/04/02 15:09] – thorisson
+++ public:cadia-clause:bsd [2024/04/29 13:33] (current) – external edit 127.0.0.1
@@ Line 3: / Line 3: @@
 ====== BSD License Extended with CADIA Clause ======
-[[public:cadia-clause:cadia-clause-main|CADIA Clause wiki page]]
+[[public:cadia-clause:cadia-clause-main|CADIA Clause wiki page]]  |  [[http://www.humanobs.org|HUMANOBS.ORG Website]]
+\\
+\\
+  //_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/
+  //_/_/
+  //_/_/  <REPLACE THIS LINE WITH THE NAME OF THE SOFTWARE >
+  //_/_/
+  //_/_/  <INSERT NAME OF SOFTWARE AUTHOR AND AFFILIATION FROM BELOW AND REMOVE THIS LINE>
+  //_/_/
+  //_/_/  Copyright(c)<INSERT THE YEAR>
+  //_/_/
+  //_/_/  This software was developed by the above copyright holder as part of the HUMANOBS EU research project,
+  //_/_/  in collaboration with the following parties:
+  //_/_/
+  //_/_/  <DELETE COPYRIGHT HOLDER FROM BELOW LIST, ALONG WITH THIS LINE>
+  //_/_/
+  //_/_/  Autonomous Systems Laboratory
+  //_/_/    Technical University of Madrid, Spain
+  //_/_/    http://www.aslab.org/
+  //_/_/
+  //_/_/  Center for Analysis and Design of Intelligent Agents
+  //_/_/    Reykjavik University, Iceland
+  //_/_/    http://ailab.ru.is/
+  //_/_/
+  //_/_/  Communicative Machines
+  //_/_/    Edinburgh, United Kingdom
+  //_/_/    http://www.cmlabs.com/
+  //_/_/
+  //_/_/  Istituto Dalle Molle di Studi sull'Intelligenza Artificiale
+  //_/_/    University of Lugano and SUPSI, Switzerland
+  //_/_/    http://www.idsia.ch/
+  //_/_/
+  //_/_/  Institute of Cognitive Sciences and Technologies
+  //_/_/    Consiglio Nazionale delle Ricerche, Italy
+  //_/_/    http://www.istc.cnr.it/
+  //_/_/
+  //_/_/  Dipartimento di Ingegneria Informatica
+  //_/_/    University of Palermo, Italy
+  //_/_/    http://roboticslab.dinfo.unipa.it/index.php/Main/HomePage
+  //_/_/
+  //_/_/
+  //_/_/  Redistribution and use in source and binary forms, with or without modification, is permitted provided
+  //_/_/  that the following conditions are met:
+  //_/_/
+  //_/_/  - Redistributions of source code must retain the above copyright and collaboration notice, this list of
+  //_/_/    conditions and the
+  //_/_/    following disclaimer.
+  //_/_/
+  //_/_/  - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and
+  //_/_/    the following
+  //_/_/    disclaimer in the documentation and/or other materials provided with the distribution.
+  //_/_/
+  //_/_/  - Neither the name of its copyright holders nor the names of its contributors may be used to endorse or
+  //_/_/    promote products
+  //_/_/    derived from this software without specific prior written permission.
+  //_/_/
+  //_/_/  - CADIA Clause: The license granted in and to the software under this agreement is a limited-use license.
+  //_/_/    The software may not be used in furtherance of: (i) intentionally causing bodily injury or severe emotional
+  //_/_/    distress to any person; (ii) invading the personal privacy or violating the human rights of any person; or
+  //_/_/    (iii) committing  or preparing for any act of war.
+  //_/_/
+  //_/_/  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  "AS IS" AND ANY
+  //_//_/ EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+  //_//_/ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+  //_//_/ COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  //_/_/  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+  //_//_/ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+  //_//_/ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  //_//_/ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+  //_//_/ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  //_/_/
+  //_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/
-<box>
-//_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/
-//_/_/
-//_/_/  <REPLACE THIS LINE WITH THE NAME OF THE SOFTWARE >
-//_/_/
-//_/_/  <INSERT NAME OF SOFTWARE AUTHOR AND AFFILIATION FROM BELOW AND REMOVE THIS LINE>
-//_/_/
-//_/_/  Copyright(c)<INSERT THE YEAR>
-//_/_/
-//_/_/  This software was developed by the above copyright holder as part of the HUMANOBS EU research project,
-//_/_/  in collaboration with the following parties:
-//_/_/
-//_/_/  <DELETE COPYRIGHT HOLDER FROM BELOW LIST, ALONG WITH THIS LINE>
-//_/_/
-//_/_/  Autonomous Systems Laboratory
-//_/_/    Technical University of Madrid, Spain
-//_/_/    http://www.aslab.org/
-//_/_/
-//_/_/  Center for Analysis and Design of Intelligent Agents
-//_/_/    Reykjavik University, Iceland
-//_/_/    http://ailab.ru.is/
-//_/_/
-//_/_/  Communicative Machines
-//_/_/    Edinburgh, United Kingdom
-//_/_/    http://www.cmlabs.com/
-//_/_/
-//_/_/  Istituto Dalle Molle di Studi sull'Intelligenza Artificiale
-//_/_/    University of Lugano and SUPSI, Switzerland
-//_/_/    http://www.idsia.ch/
-//_/_/
-//_/_/  Institute of Cognitive Sciences and Technologies
-//_/_/    Consiglio Nazionale delle Ricerche, Italy
-//_/_/    http://www.istc.cnr.it/
-//_/_/
-//_/_/  Dipartimento di Ingegneria Informatica
-//_/_/    University of Palermo, Italy
-//_/_/    http://roboticslab.dinfo.unipa.it/index.php/Main/HomePage
-//_/_/
-//_/_/
-//_/_/  Redistribution and use in source and binary forms, with or without modification, is permitted provided that the following //_/_/  conditions are met:
-//_/_/
-//_/_/  - Redistributions of source code must retain the above copyright and collaboration notice, this list of conditions and the //_/_/    following disclaimer.
-//_/_/
-//_/_/  - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following
-//_/_/    disclaimer in the documentation and/or other materials provided with the distribution.
-//_/_/
-//_/_/  - Neither the name of its copyright holders nor the names of its contributors may be used to endorse or promote products
-//_/_/    derived from this software without specific prior written permission.
-//_/_/
-//_/_/  - The license granted in and to the software under this agreement is a limited-use license.  The software may not be used //_/_/     in furtherance of: (i) intentionally causing bodily injury or severe emotional distress to any person; (ii) invading the
- //_/_/    personal privacy or violating the human rights of any person; or (iii) committing  or preparing for any act of war.
-//_/_/
-//_/_/  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS  "AS IS" AND ANY
-//_//_/ EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-//_//_/ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-//_//_/ COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-//_/_/  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-//_//_/ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-//_//_/ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-//_//_/ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-//_//_/ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//_/_/
-//_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/
-</box>
 \\
 \\