Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
dynare
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dynare
dynare
Commits
5e80b276
Verified
Commit
5e80b276
authored
5 years ago
by
Sébastien Villemot
Browse files
Options
Downloads
Patches
Plain Diff
license.txt: various fixes
(cherry picked from commit
9ba634ad
)
parent
d4e8d954
No related branches found
No related tags found
1 merge request
!1815
WIP Cherry-picks for 4.6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
license.txt
+5
-10
5 additions, 10 deletions
license.txt
with
5 additions
and
10 deletions
license.txt
+
5
−
10
View file @
5e80b276
...
...
@@ -247,7 +247,7 @@ Files: doc/*.rst doc/*.tex doc/*.svg doc/*.pdf doc/*.bib
Copyright: 1996-2020 Dynare Team
License: GFDL-NIV-1.3+
Files: doc/dr.tex doc/dr.bib doc/bvar
_a_
la
_
sims.tex
Files: doc/dr.tex doc/dr.bib doc/bvar
-a-
la
-
sims.tex
Copyright: 2007-2011 Sébastien Villemot
License: GFDL-NIV-1.3+
...
...
@@ -309,13 +309,8 @@ Copyright: 2009-2019 Homebrew contributors
License: BSD-2-clause
Files: preprocessor/m4/ax_boost_base.m4
preprocessor/m4/ax_boost_system.m4
preprocessor/m4/ax_boost_filesystem.m4
Copyright: 2008-2009 Thomas Porschberg <thomas@randspringer.de>
2009 Peter Adolphs
2008-2009 Michael Tindal
2008 Daniel Casimiro <dan.casimiro@gmail.com>
2009 Roman Rybalko <libtorrent@romanr.info>
License: FSFAP
Files: preprocessor/m4/ax_cxx_compile_stdcxx.m4
...
...
@@ -344,7 +339,7 @@ Files: preprocessor/doc/preprocessor/*
Copyright: 2007-2019 Dynare Team
License: CC-BY-SA-4.0
Files: contrib/jsonlab
Files: contrib/jsonlab
/*
Copyright: 2011-2018 Qianqian Fang <q.fang at neu.edu>
License: BSD-2-clause or GPL-3+
...
...
@@ -614,7 +609,7 @@ License: CC-BY-SA-4.0
material not subject to the license. This includes other CC-
licensed material, or material used under an exception or
limitation to copyright. More considerations for licensors:
wiki.creativecommons.org/Considerations_for_licensors
wiki.creativecommons.org/Considerations_for_licensors
.
Considerations for the public: By using one of our public
licenses, a licensor grants the public permission to use the
...
...
@@ -630,8 +625,8 @@ License: CC-BY-SA-4.0
such as asking that all changes be marked or described.
Although not required by our licenses, you are encouraged to
respect those requests where reasonable. More_considerations
for the public:
wiki.creativecommons.org/Considerations_for_licensees
for the public:
wiki.creativecommons.org/Considerations_for_licensees
.
=======================================================================
.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment