aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <alonzakai@gmail.com>2011-06-23 16:07:17 -0700
committerAlon Zakai <alonzakai@gmail.com>2011-06-23 16:07:17 -0700
commit67edb0096dd6f4d07c604834679dbfd1337e4c50 (patch)
treebf50c89fefebae6ab6ed79d87b928fcc2ac4e91e
parentcad53ce8a705d2318a5c5c6b5567c36e3427bb4d (diff)
LICENSE and AUTHORS
-rw-r--r--AUTHORS7
-rw-r--r--LICENSE8
2 files changed, 8 insertions, 7 deletions
diff --git a/AUTHORS b/AUTHORS
index e70748be..3db02f2d 100644
--- a/AUTHORS
+++ b/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)
+*
+*
diff --git a/LICENSE b/LICENSE
index ac26c241..6d090777 100644
--- a/LICENSE
+++ b/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