Skip to content

Commit

Permalink
Reorganize license files
Browse files Browse the repository at this point in the history
* Moved the Chunky license to the file ./LICENSE.
* Moved third-party licenses to ./licenses/.
  • Loading branch information
llbit committed Oct 9, 2016
1 parent 0d570e1 commit b4ae8c7
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 5 deletions.
File renamed without changes.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ Copyright & License
Chunky is Copyright (c) 2010-2016, Jesper Öqvist <[email protected]>

Permission to modify and redistribute is granted under the terms of
the GPLv3 license. See the file `license/LICENSE.txt` for the full license.
the GPLv3 license. See the file `LICENSE` for the full license.

Chunky uses the following 3rd party libraries:

* **Markdown by John Gruber.**
Markdown is covered by the Modified BSD License.
See the file license/Markdown.txt for the full license and copyright notice.
See the file `licenses/Markdown.txt` for the full license and copyright notice.
* **Apache Commons Math library by the Apache Software Foundation.**
The library is covered by the Apache License, version 2.0.
See the file license/Apache-2.0.txt for the full license text.
See the file license/commons-math.txt for the copyright notices.
See the file `licenses/Apache-2.0.txt` for the full license text.
See the file `licenses/commons-math.txt` for the copyright notices.

Launching Chunky
----------------
Expand Down
3 changes: 2 additions & 1 deletion dist/Chunky.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ RequestExecutionLevel admin
!define MUI_ABORTWARNING

; Pages
!insertmacro MUI_PAGE_LICENSE license\LICENSE.txt
!insertmacro MUI_PAGE_LICENSE LICENSE
!insertmacro MUI_PAGE_COMPONENTS
!insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_INSTFILES
Expand Down Expand Up @@ -93,6 +93,7 @@ Section "Chunky (required)" SecChunky

File /oname=chunky.jar build\chunky-@[email protected]
File build\ReadMe.html
File /oname=LICENSE.txt LICENSE
File build\release_notes-@[email protected]
File dist\chunky.ico

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit b4ae8c7

Please sign in to comment.