Skip to content

Unify Licenses #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
koppor merged 4 commits into from
Jul 29, 2015
Merged

Unify Licenses #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2389fc7
Remove missing jgoodies.txt
stefan-kolb Jul 29, 2015
c868391
Correct README path
stefan-kolb Jul 29, 2015
1461f67
Removes unused LGPL license
stefan-kolb Jul 29, 2015
f54dcec
Use GPL2 as current license
stefan-kolb Jul 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 gpl2.txt → LICENSE
View file
Open in desktop
File renamed without changes.
5 changes: 3 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ JabRef is free software: you can redistribute it and/or modify it under the
terms of the GNU General Public License as published by the Free Software
Foundation, either version 2 of the License, or (at your option) any later
version.
See the enclosed text files [gpl2.txt](gpl2.txt) and [gpl3.txt](gpl3.txt) for full details.
See the [LICENSE](LICENSE) for full details.

JabRef also uses libraries distributed by other parties; see the About box for details.
JabRef also uses libraries distributed by other parties.
See [external libraries](external-libraries.txt) for details.
13 changes: 4 additions & 9 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,11 +168,8 @@
<include name="plugins/**" />
</fileset>
<fileset dir="${txt.dir}">
<include name="gpl2.txt" />
<include name="gpl3.txt" />
<include name="lesser.txt" />
<include name="jgoodies.txt" />
<include name="README" />
<include name="LICENSE" />
<include name="README.md" />
</fileset>
<manifest>
<attribute name="Main-Class" value="net.sf.jabref.JabRefMain" />
Expand Down Expand Up @@ -446,10 +443,8 @@ version=${jabref.version}</echo>

<copy todir="${win.installer.dir}/dist">
<fileset dir="${txt.dir}">
<include name="gpl2.txt" />
<include name="gpl3.txt" />
<include name="lesser.txt" />
<include name="README" />
<include name="LICENSE" />
<include name="README.md" />
</fileset>
</copy>

Expand Down
Loading