Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Jules Jacobs
Iris
Commits
7fcb2969
Commit
7fcb2969
authored
Mar 13, 2020
by
Ralf Jung
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'jung-master-patch-98309' into 'master'
fill in blanks in license See merge request
iris/iris!387
parents
9f19f1ab
0d32b394
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
15 deletions
+17
-15
LICENSE
LICENSE
+5
-5
LICENSE-CODE
LICENSE-CODE
+11
-9
LICENSE-DOCS
LICENSE-DOCS
+1
-1
No files found.
LICENSE
View file @
7fcb2969
The source code (i.e., everything except for files in the docs/
folder) in this
development is licensed under the terms of the BSD license,
while the
documentation (i.e., everything inside the docs/ folder) is
licensed under the
terms of the CC-BY 4.0 license. Fur further details, see
LICENSE-CODE and
LICENSE-DOCS, respectively.
The source code (i.e., everything except for files in the docs/
and tex/
folders) in this
development is licensed under the terms of the BSD license,
while the
documentation (i.e., everything inside the docs/
and tex/
folder
s
) is
licensed under the
terms of the CC-BY 4.0 license. Fur further details, see
LICENSE-CODE and
LICENSE-DOCS, respectively.
LICENSE-CODE
View file @
7fcb2969
All files in this development, excluding those in docs/, are distributed
under the terms of the BSD license, included below.
All files in this development, excluding those in docs/ and tex/, are
distributed under the terms of the BSD license, included below.
Copyright: Iris developers and contributors
------------------------------------------------------------------------------
...
...
@@ -12,17 +14,17 @@ modification, are permitted provided that the following conditions are met:
* 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 the
<organization> nor the
names of its contributors
may be used to endorse or promote products
derived from this software
without specific prior written permission.
* Neither the name of the
copyright holder nor the names of its contributors
may be used to endorse or promote products
derived from this software
without specific prior written permission.
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
<
COPYRIGHT HOLDER
>
BE LIABLE FOR
ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
DISCLAIMED. IN NO EVENT SHALL
THE
COPYRIGHT HOLDER
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
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.
LICENSE-DOCS
View file @
7fcb2969
All files in the docs/ folder of this development are distributed
All files in the docs/
and tex/
folder
s
of this development are distributed
under the terms of the CC-BY 4.0 license <https://creativecommons.org/licenses/by/4.0/>.
For your convenience, a plain-text version of the license is included below.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment