diff options
| author | Erick Tryzelaar <erick.tryzelaar@gmail.com> | 2013-03-01 20:35:55 -0800 |
|---|---|---|
| committer | Erick Tryzelaar <erick.tryzelaar@gmail.com> | 2013-03-01 20:35:55 -0800 |
| commit | aa3505d8ff043f0c1da62de4f517eed6defb6187 (patch) | |
| tree | d0f82e2e5dd7b3dfeeb8b593ed0d76393e41ff05 /src/libfuzzer/fuzzer.rc | |
| parent | 85fecd0ba77066e604cec9d3866b76edc626b5d3 (diff) | |
| parent | 0fd1b58f236b4fe653d164836e94feebb2972931 (diff) | |
| download | rust-aa3505d8ff043f0c1da62de4f517eed6defb6187.tar.gz rust-aa3505d8ff043f0c1da62de4f517eed6defb6187.zip | |
Merge remote-tracking branch 'remotes/origin/incoming' into incoming
Diffstat (limited to 'src/libfuzzer/fuzzer.rc')
| -rw-r--r-- | src/libfuzzer/fuzzer.rc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libfuzzer/fuzzer.rc b/src/libfuzzer/fuzzer.rc index 97ac8cf2d50..c16a7cf8d3e 100644 --- a/src/libfuzzer/fuzzer.rc +++ b/src/libfuzzer/fuzzer.rc @@ -1,4 +1,4 @@ -// Copyright 2012 The Rust Project Developers. See the COPYRIGHT +// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT // file at the top-level directory of this distribution and at // http://rust-lang.org/COPYRIGHT. // @@ -15,7 +15,7 @@ url = "https://github.com/mozilla/rust/tree/master/src/libfuzzer")]; #[comment = "The Rust fuzzer library"]; -#[license = "MIT"]; +#[license = "MIT/ASL2"]; #[crate_type = "lib"]; #[no_core]; |