From fea7ecf8508769105ab94a15d5ce6cd52ca9e70b Mon Sep 17 00:00:00 2001 From: Jeffrey Phillips Freeman <the@jeffreyfreeman.me> Date: Wed, 30 Sep 2020 15:38:41 -0400 Subject: [PATCH] Updated wording of attributions file to be more clear. --- ATTRIBUTIONS.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ATTRIBUTIONS.md b/ATTRIBUTIONS.md index 140b9bdb..ad5e008f 100644 --- a/ATTRIBUTIONS.md +++ b/ATTRIBUTIONS.md @@ -10,11 +10,12 @@ Copyright (c) 2010-2011, Advanced Micro Devices, Inc. All rights reserved. ## Licenses -Aparapi is currently licensed under the Apache License version 2. However it is important to note that this project has -used code from other projects originally licensed under seperate, but compatible licenses. Since these license require -retaining original copyrights, and a reference to the original license it is important to mention that here. - -The text of the original license used by AMD contained the following text: +Aparapi is currently licensed under the Apache License version 2. However it is important to note that the project +owners decided to migrate licenses back in 2016. Under legal advice of a lawyer it was determined the new license, +Apache License version 2, and was fully relicensed as such. This software, therefore, may be destributed under +the Apache License with no additional restrictions beyond those expressed in the Apache License. However, since +both the original license and the Apache License require copyright text and original license text to be provided +for reference the original wording of the license shall be included here as follows: Copyright (c) 2010-2011, Advanced Micro Devices, Inc. All rights reserved. -- GitLab