about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-01-23 09:49:34 +0000
committerbors <bors@rust-lang.org>2016-01-23 09:49:34 +0000
commit332e34524072abc213c65b98e8dbb81f2c5c912a (patch)
tree9b98033312755bd336d0fd08015434128e967287
parent228afd725129fe141ae934ed08814927107c0dad (diff)
parentc331ed044335d10f802a86a48b655c677b4a7238 (diff)
downloadrust-332e34524072abc213c65b98e8dbb81f2c5c912a.tar.gz
rust-332e34524072abc213c65b98e8dbb81f2c5c912a.zip
Auto merge of #30958 - dhodder:master, r=brson
The COPYRIGHT file should be updated to note that Rust no longer ships with AUTHORS.txt.

    $ git log -1 -- AUTHORS.txt
    commit 402749c539edcbc2d850ac3a782cace8661c68e6
    Author: Brian Anderson <banderson@mozilla.com>
    Date:   Wed Dec 2 22:16:08 2015 +0000

        Remove AUTHORS.txt and add-authors.sh

        Keeping this file up to date requires hours of work every release,
        even with the script. It is a fool's errand and we shall not do it
        any longer.
-rw-r--r--COPYRIGHT2
1 files changed, 1 insertions, 1 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index 5ab70b7120f..c7ea3d39c5c 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -7,7 +7,7 @@ terms.
 Longer version:
 
 The Rust Project is copyright 2016, The Rust Project
-Developers (given in the file AUTHORS.txt).
+Developers.
 
 Licensed under the Apache License, Version 2.0
 <LICENSE-APACHE or