Skip to content

Commit

Permalink
Merge branch 'master' into shape2D_outline_editor_setting
Browse files Browse the repository at this point in the history
  • Loading branch information
markdibarry authored Jan 24, 2022
2 parents 0a647ed + 6a3ff8f commit 9ef7b32
Show file tree
Hide file tree
Showing 185 changed files with 6,712 additions and 1,866 deletions.
4 changes: 4 additions & 0 deletions AUTHORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ name is available.
bruvzg
Cameron Reikes (creikey)
Camille Mohr-Daurat (pouleyKetchoupp)
Caner Demirer (cdemirer)
Carl Olsson (not-surt)
Carter Anderson (cart)
Chris Bradfield (cbscribe)
Expand Down Expand Up @@ -147,6 +148,7 @@ name is available.
Marcus Elg (MCrafterzz)
Mariano Javier Suligoy (MarianoGnu)
Mario Schlack (hurikhan)
Marios Staikopoulos (marstaik)
Martin Capitanio (capnm)
Martin Liška (marxin)
Martin Sjursen (binbitten)
Expand All @@ -160,6 +162,7 @@ name is available.
Meru Patel (Janglee123)
Michael Alexsander (YeldhamDev)
MichiRecRoom (LikeLakers2)
Morris "Tabor" Arroad (mortarroad)
mrezai
muiroc
Nathan Franke (nathanfranke)
Expand All @@ -169,6 +172,7 @@ name is available.
Nils André-Chang (NilsIrl)
Noah Beard (TwistedTwigleg)
Nuno Donato (nunodonato)
Omar El Sheikh (The-O-King)
Ovnuniarchos
Pascal Richter (ShyRed)
Patrick (firefly2442)
Expand Down
11 changes: 5 additions & 6 deletions COPYRIGHT.txt
Original file line number Diff line number Diff line change
Expand Up @@ -171,17 +171,16 @@ Comment: DroidSans font
Copyright: 2008, The Android Open Source Project
License: Apache-2.0

Files: ./thirdparty/fonts/JetBrainsMono_Regular.ttf
Comment: JetBrains Mono font
Copyright: 2020, JetBrains s.r.o.
License: OFL-1.1

Files: ./thirdparty/fonts/NotoSans*.ttf
Comment: Noto Sans font
Copyright: 2012, Google Inc.
License: OFL-1.1

Files: ./thirdparty/fonts/Hack_Regular.ttf
Comment: Hack font
Copyright: 2018, Source Foundry Authors
2003, Bitstream Inc.
License: Expat and Bitstream Vera Fonts Copyright

Files: ./thirdparty/freetype/
Comment: The FreeType Project
Copyright: 1996-2021, David Turner, Robert Wilhelm, and Werner Lemberg.
Expand Down
Loading

0 comments on commit 9ef7b32

Please sign in to comment.