Merge branch 'rel/1.0.0' into merge_rel_1_0_0_into_rel_1_0_1
* rel/1.0.0: Update LZMA license with correct text Add license text to LZMA SDK license notice
This commit is contained in:
commit
a9a986c30c
2 changed files with 12 additions and 3 deletions
|
@ -31,9 +31,13 @@ specific language governing permissions and limitations under the License.
|
|||
License notice for LZMA SDK
|
||||
---------------------------
|
||||
|
||||
http://www.7-zip.org/sdk.html
|
||||
http://7-zip.org/sdk.html
|
||||
|
||||
LZMA is placed in the public domain.
|
||||
LZMA SDK is placed in the public domain.
|
||||
|
||||
Anyone is free to copy, modify, publish, use, compile, sell, or distribute the
|
||||
original LZMA SDK code, either in source code form or as a compiled binary,
|
||||
for any purpose, commercial or non-commercial, and by any means.
|
||||
|
||||
License notice for RFC 3492
|
||||
---------------------------
|
||||
|
|
|
@ -2,4 +2,9 @@
|
|||
This source came from the C# implementation of LZMA from the LZMA SDK, version 16.02, from http://www.7-zip.org/sdk.html.
|
||||
|
||||
## License
|
||||
The LZMA SDK is public domain. Thanks goes to Igor Pavlov for making this available.
|
||||
LZMA SDK is placed in the public domain.
|
||||
|
||||
Anyone is free to copy, modify, publish, use, compile, sell, or distribute the original LZMA SDK code, either in source code form or as a compiled binary, for any purpose, commercial or non-commercial, and by any means.
|
||||
|
||||
## Thanks!
|
||||
Thanks goes to Igor Pavlov for making this available.
|
||||
|
|
Loading…
Reference in a new issue