[Cmake-commits] CMake branch, next, updated. v3.6.2-2522-gcdaf32e

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  cdaf32edb833a9cdfd71b99e2a013206c2a5bc42 (commit)
       via  c1d108a9f207225c7b1342a60cd88fd325fa7ced (commit)
      from  ed5809dd7da5b11f65ecb3996adc37d9cfecf145 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cdaf32edb833a9cdfd71b99e2a013206c2a5bc42
commit cdaf32edb833a9cdfd71b99e2a013206c2a5bc42
Merge: ed5809d c1d108a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 26 17:24:48 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 26 17:24:48 2016 -0400

    Merge topic 'copyright-by-contributors' into next
    
    c1d108a9 Revert "Copyright.txt: Add notice of copyright by contributors"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c1d108a9f207225c7b1342a60cd88fd325fa7ced
commit c1d108a9f207225c7b1342a60cd88fd325fa7ced
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 26 17:24:12 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Sep 26 17:24:12 2016 -0400

    Revert "Copyright.txt: Add notice of copyright by contributors"
    
    This reverts commit 16fddd040338061d5ed3b652fdbb1f6fc3d99240.
    It will be revised and restored.

diff --git a/Copyright.txt b/Copyright.txt
index 7b06205..f99998f 100644
--- a/Copyright.txt
+++ b/Copyright.txt
@@ -1,5 +1,5 @@
 CMake - Cross Platform Makefile Generator
-Copyright 2000-2016 Kitware, Inc. and Contributors
+Copyright 2000-2016 Kitware, Inc.
 Copyright 2000-2011 Insight Software Consortium
 All rights reserved.
 
@@ -15,7 +15,7 @@ are met:
   documentation and/or other materials provided with the distribution.
 
 * Neither the names of Kitware, Inc., the Insight Software Consortium,
-  nor the names of their Contributors may be used to endorse or promote
+  nor the names of their contributors may be used to endorse or promote
   products derived from this software without specific prior written
   permission.
 
@@ -35,7 +35,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 The above copyright and license notice applies to distributions of
 CMake in source and binary form.  Some source files contain additional
-notices of original copyright by their Contributors; see each source
+notices of original copyright by their contributors; see each source
 for details.  Third-party software packages supplied with CMake under
 compatible licenses provide their own copyright notices documented in
 corresponding subdirectories.

-----------------------------------------------------------------------

Summary of changes:
 Copyright.txt |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake