Merge remote branch 'sevrak/issue-5164' into incoming

Author: pcwalton

src/libcore/core.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.
 //
@@ -41,7 +41,7 @@ Implicitly, all crates behave as if they included the following prologue:
        url = "https://github.com/mozilla/rust/tree/master/src/libcore")];
 
 #[comment = "The Rust core library"];
-#[license = "MIT"];
+#[license = "MIT/APL2"];
 #[crate_type = "lib"];
 
 

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/APL2"];
 #[crate_type = "lib"];
 #[no_core];
 

src/librust/rust.rc

@@ -17,6 +17,7 @@
        uuid = "4a24da33-5cc8-4037-9352-2cbe9bd9d27c",
        url = "https://github.com/mozilla/rust/tree/master/src/rust")];
 
+#[license = "MIT/APL2"];
 #[crate_type = "lib"];
 
 extern mod core(vers = "0.6");

src/librustc/rustc.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/rustc")];
 
 #[comment = "The Rust compiler"];
-#[license = "MIT"];
+#[license = "MIT/APL2"];
 #[crate_type = "lib"];
 
 #[legacy_modes];

src/librustdoc/rustdoc.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.
 //
@@ -16,7 +16,7 @@
        url = "https://github.com/mozilla/rust/tree/master/src/rustdoc")];
 
 #[comment = "The Rust documentation generator"];
-#[license = "MIT"];
+#[license = "MIT/APL2"];
 #[crate_type = "lib"];
 
 #[no_core];

src/librusti/rusti.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,6 +15,7 @@
        uuid = "7fb5bf52-7d45-4fee-8325-5ad3311149fc",
        url = "https://github.com/mozilla/rust/tree/master/src/rusti")];
 
+#[license = "MIT/APL2"];
 #[crate_type = "lib"];
 
 #[no_core];

src/librustpkg/rustpkg.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,6 +15,7 @@
        uuid = "25de5e6e-279e-4a20-845c-4cabae92daaf",
        url = "https://github.com/mozilla/rust/tree/master/src/librustpkg")];
 
+#[license = "MIT/APL2"];
 #[crate_type = "lib"];
 #[no_core];
 #[allow(vecs_implicitly_copyable,

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)];

src/libsyntax/syntax.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.
 //
@@ -14,6 +14,7 @@
 
 
 
+#[license = "MIT/APL2"];
 #[crate_type = "lib"];
 
 #[legacy_modes];