diff --git a/site/LICENSE.md b/LICENSE.md similarity index 85% rename from site/LICENSE.md rename to LICENSE.md index 6f1b34b53..062dd4513 100644 --- a/site/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,8 @@ The MIT License (MIT) -Copyright (c) 2015 Nick Cameron +Copyright (c) 2015-present Mark Simulacrum, Nick Cameron and rustc-perf contributors + +Note that this license doesn't apply to code under the collector/compile-benchmarks directory. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/collector/LICENSE b/collector/LICENSE deleted file mode 100644 index 2e7c32230..000000000 --- a/collector/LICENSE +++ /dev/null @@ -1,25 +0,0 @@ -Copyright (c) 2017 Mark Simulacrum - -Permission is hereby granted, free of charge, to any -person obtaining a copy of this software and associated -documentation files (the "Software"), to deal in the -Software without restriction, including without -limitation the rights to use, copy, modify, merge, -publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software -is 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 Software. - -THE SOFTWARE IS 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 SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE.