Skip to content

Commit

Permalink
Merge 50c0485 into 4e40b28
Browse files Browse the repository at this point in the history
  • Loading branch information
goropikari committed Jul 20, 2019
2 parents 4e40b28 + 50c0485 commit 5056e53
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 17 deletions.
26 changes: 25 additions & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The Notifier.jl package is licensed under the MIT "Expat" License:

> Copyright (c) 2017-2018: goropikari.
> Copyright (c) 2017-2019: goropikari.
>
> Permission is hereby granted, free of charge, to any person obtaining a copy
> of this software and associated documentation files (the "Software"), to deal
Expand Down Expand Up @@ -44,3 +44,27 @@ Related to macOS, especially mac.jl, is:
> SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
default.wav (se_maoudamashii_onepoint22.wav) : [魔王魂](https://maoudamashii.jokersounds.com/)


Julia logo design by Stefan Karpinski \<stefan@karpinski.org\> is licensed under [CC BY-NC-SA 4.0](https://creativecommons.org/licenses/by-nc-sa/4.0/).

logo.svg and three-balls.ico are:
> Copyright (c) 2017: julia-logo-graphics(https://github.com/JuliaLang/julia-logo-graphics) Contributors.
>
> Permission is hereby granted, free of charge, to any person obtaining a copy
> of this software and associated documentation files (the "Software"), to deal
> in the Software without restriction, including without limitation the rights
> to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
> copies of the Software, and to permit persons to whom the Software is
> furnished to do so, subject to the following conditions:
>
> The above copyright notice and this permission notice shall be included in all
> copies or substantial portions of the Software.
>
> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
> AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
> OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
> SOFTWARE.
22 changes: 6 additions & 16 deletions src/logo.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/three-balls.ico
Binary file not shown.

0 comments on commit 5056e53

Please sign in to comment.