Skip to content
Browse files

LICENSE and AUTHORS

  • Loading branch information...
1 parent cad53ce commit 67edb0096dd6f4d07c604834679dbfd1337e4c50 @kripken kripken committed
Showing with 8 additions and 7 deletions.
  1. +6 −1 AUTHORS
  2. +2 −6 LICENSE
View
7 AUTHORS
@@ -1,2 +1,7 @@
-Alon Zakai <azakai@mozilla.com>
+The following authors have all licensed their contributions to Emscripten
+under the licensing terms detailed in LICENSE.
+
+* Alon Zakai <alonzakai@gmail.com> (copyright owned by Mozilla Foundation)
+*
+*
View
8 LICENSE
@@ -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
@@ -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

0 comments on commit 67edb00

Please sign in to comment.
Something went wrong with that request. Please try again.