diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2013-03-01 08:39:02 -0800 |
|---|---|---|
| committer | Patrick Walton <pcwalton@mimiga.net> | 2013-03-01 08:39:02 -0800 |
| commit | c355f17943e1dc3ec9c3193f35fc1ec9c43f51d4 (patch) | |
| tree | 58f2a811c1c22613c6e3a0352ad41a7aa27cec40 /src/libstd | |
| parent | 1d34a55d880baa3d186e72d345c1d3ce99d88d2c (diff) | |
| parent | 833ad6018e0fcb4f1fda1ca54feb8256bad27513 (diff) | |
| download | rust-c355f17943e1dc3ec9c3193f35fc1ec9c43f51d4.tar.gz rust-c355f17943e1dc3ec9c3193f35fc1ec9c43f51d4.zip | |
Merge remote branch 'sevrak/issue-5164' into incoming
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/std.rc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/std.rc b/src/libstd/std.rc index 854abfdd112..9ef490670ed 100644 --- a/src/libstd/std.rc +++ b/src/libstd/std.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. // @@ -23,7 +23,7 @@ not required in or otherwise suitable for the core library. url = "https://github.com/mozilla/rust/tree/master/src/libstd")]; #[comment = "The Rust standard library"]; -#[license = "MIT"]; +#[license = "MIT/APL2"]; #[crate_type = "lib"]; #[allow(vecs_implicitly_copyable)]; |