Skip to content

Commit

Permalink
🎆 2020 -> 2021: Happy New Year!
Browse files Browse the repository at this point in the history
  • Loading branch information
database64128 committed Dec 31, 2020
1 parent 14dc1a2 commit 4438844
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 56 deletions.
56 changes: 1 addition & 55 deletions LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@ copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS

Copyright (C) 2015 clowwindy <[email protected]>
Copyright (C) 2020 Shadowsocks Project <https://shadowsocks.org>
Copyright (C) 2021 Shadowsocks Project <https://shadowsocks.org>

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -986,42 +986,6 @@ consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.


mbed TLS
--------

https://tls.mbed.org

License: https://raw.githubusercontent.com/ARMmbed/mbedtls/master/LICENSE


Newtonsoft.Json
----------

https://raw.githubusercontent.com/JamesNK/Newtonsoft.Json/master/LICENSE.md

The MIT License (MIT)

Copyright (c) 2007 James Newton-King

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.


ZXing
-----

Expand All @@ -1038,21 +1002,3 @@ distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

libsodium
---------

Copyright (c) 2013-2015
Frank Denis <j at pureftpd dot org>

Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.

THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
2 changes: 1 addition & 1 deletion Shadowsocks.WPF/Shadowsocks.WPF.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<Version>5.0.0</Version>
<ApplicationIcon>shadowsocks.ico</ApplicationIcon>
<Nullable>enable</Nullable>
<Copyright2020 Clowwindy &amp; The Community</Copyright>
<Copyright2021 Clowwindy &amp; The Community</Copyright>
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
<PackageProjectUrl>https://github.com/shadowsocks/shadowsocks-windows</PackageProjectUrl>
<RepositoryUrl>https://github.com/shadowsocks/shadowsocks-windows</RepositoryUrl>
Expand Down

0 comments on commit 4438844

Please sign in to comment.