Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into pm-publishpackage…
Browse files Browse the repository at this point in the history
…-packagecontents
  • Loading branch information
dnenov committed Nov 13, 2023
2 parents c8b6f1f + ec16645 commit 7cf3df8
Show file tree
Hide file tree
Showing 107 changed files with 8,558 additions and 2,035 deletions.
29 changes: 29 additions & 0 deletions LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,35 @@ Copyright (c) 2022 Fonticons, Inc. (https://fontawesome.com)

In the Font Awesome Free download, the CC BY 4.0 license applies to all icons packaged as SVG and JS file types.

Icons: CC BY 4.0 License (https://creativecommons.org/licenses/by/4.0/): The Font Awesome Free download is licensed under a Creative Commons Attribution 4.0 International License and applies to all icons packaged as SVG and JS file types.

Fonts: SIL OFL 1.1 License
In the Font Awesome Free download, the SIL OFL license applies to all icons packaged as web and desktop font files.
Copyright (c) 2023 Fonticons, Inc. (https://fontawesome.com)
with Reserved Font Name: "Font Awesome".
This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license can be found at: http://scripts.sil.org/OFL

Code: MIT License (https://opensource.org/licenses/MIT)
In the Font Awesome Free download, the MIT license applies to all non-font and
non-icon files.
Copyright 2023 Fonticons, Inc.
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.


Cyotek.Drawing.BitmapFont v.2.0.0:
https://github.com/cyotek/Cyotek.Drawing.BitmapFont
https://github.com/cyotek/Cyotek.Drawing.BitmapFont/blob/master/LICENSE.txt
Expand Down
1,300 changes: 670 additions & 630 deletions doc/distrib/License.rtf

Large diffs are not rendered by default.

Loading

0 comments on commit 7cf3df8

Please sign in to comment.