servo: Merge #10715 - Allow another wording of apache2/MIT (used by gaol) (from edunham:tidy-licenses); r=larsbergstrom

r? @larsbergstrom

need this for https://github.com/servo/servo/issues/10636

Source-Repo: https://github.com/servo/servo
Source-Revision: a129ce1bccf313db85547a5c32ecf8cd7aac489b
This commit is contained in:
edunham
2016-04-20 01:30:16 +05:00
parent a7611b3347
commit 59853ded48
2 changed files with 12 additions and 1 deletions

View File

@@ -59,4 +59,15 @@ licenses = [
# except according to those terms.
""",
"""\
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
"""
] # noqa: Indicate to flake8 that we do not want to check indentation here