diff options
author | David Neto <dneto@google.com> | 2016-09-01 15:33:59 -0400 |
---|---|---|
committer | David Neto <dneto@google.com> | 2016-09-02 10:00:29 -0400 |
commit | 9fc8658ef301b0f03b2173d274c52f011b5c73e5 (patch) | |
tree | 2a88242a9f19ac841977123578c1434fa032a690 /README.md | |
parent | 6f35405a977393949759a5fbf72d29e806981d65 (diff) |
Relicense SPIRV-Tools under Apache 2.0
Fixes https://github.com/KhronosGroup/SPIRV-Tools/issues/383
Finalize v2016.4
Diffstat (limited to 'README.md')
-rw-r--r-- | README.md | 37 |
1 files changed, 13 insertions, 24 deletions
@@ -61,7 +61,7 @@ The SPIR-V Tools are maintained by members of the The Khronos Group Inc., at https://github.com/KhronosGroup/SPIRV-Tools. Contributions via merge request are welcome. Changes should: -* Be provided under the [Khronos license](#license). +* Be provided under the [Apache 2.0](#license). * Include tests to cover updated functionality. * C++ code should follow the [Google C++ Style Guide][cpp-style-guide]. * Code should be formatted with `clang-format`. Settings are defined by @@ -282,32 +282,21 @@ This is a work in progress. ## Licence <a name="license"></a> +Full license terms are in [LICENSE](LICENSE) ``` Copyright (c) 2015-2016 The Khronos Group Inc. -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and/or associated documentation files (the -"Materials"), to deal in the Materials without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Materials, and to -permit persons to whom the Materials are furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be included -in all copies or substantial portions of the Materials. - -MODIFICATIONS TO THIS FILE MAY MEAN IT NO LONGER ACCURATELY REFLECTS -KHRONOS STANDARDS. THE UNMODIFIED, NORMATIVE VERSIONS OF KHRONOS -SPECIFICATIONS AND HEADER INFORMATION ARE LOCATED AT - https://www.khronos.org/registry/ - -THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. ``` [spirv-registry]: https://www.khronos.org/registry/spir-v/ |