Skip to content

Commit

Permalink
LICENSE and AUTHORS
Browse files Browse the repository at this point in the history
  • Loading branch information
kripken committed Jun 23, 2011
1 parent cad53ce commit 67edb00
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
7 changes: 6 additions & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
Alon Zakai <[email protected]>
The following authors have all licensed their contributions to Emscripten
under the licensing terms detailed in LICENSE.

* Alon Zakai <[email protected]> (copyright owned by Mozilla Foundation)
*
*

8 changes: 2 additions & 6 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ The full text of both licenses follows.

==============================================================================

Copyright (c) 2010 Alon Zakai
Copyright (c) 2010 Mozilla Foundation
Copyright (c) 2010-2011 Emscripten authors, see AUTHORS file.

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 All @@ -36,12 +35,9 @@ THE SOFTWARE.

==============================================================================

Copyright (c) 2010 Alon Zakai
Copyright (c) 2010 Mozilla Foundation
Copyright (c) 2010-2011 Emscripten authors, see AUTHORS file.
All rights reserved.

Developed by: Alon Zakai, Mozilla

Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the
"Software"), to deal with the Software without restriction, including
Expand Down

0 comments on commit 67edb00

Please sign in to comment.