From 67edb0096dd6f4d07c604834679dbfd1337e4c50 Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Thu, 23 Jun 2011 16:07:17 -0700 Subject: [PATCH] LICENSE and AUTHORS --- AUTHORS | 7 ++++++- LICENSE | 8 ++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/AUTHORS b/AUTHORS index e70748be044a4..3db02f2d3cb1d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,2 +1,7 @@ -Alon Zakai +The following authors have all licensed their contributions to Emscripten +under the licensing terms detailed in LICENSE. + +* Alon Zakai (copyright owned by Mozilla Foundation) +* +* diff --git a/LICENSE b/LICENSE index ac26c241f70a5..6d0907770a30f 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