[Cmake-commits] CMake branch, next, updated. v3.6.2-2495-g5e2813b
Brad King
brad.king at kitware.com
Mon Sep 26 13:14:32 EDT 2016
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 5e2813bc7a5fc95e09da993384bad8801df476ee (commit)
via 16fddd040338061d5ed3b652fdbb1f6fc3d99240 (commit)
from 6330c8f70b69e8aac2d05846ad509d9972df2090 (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=5e2813bc7a5fc95e09da993384bad8801df476ee
commit 5e2813bc7a5fc95e09da993384bad8801df476ee
Merge: 6330c8f 16fddd0
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 26 13:14:31 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 26 13:14:31 2016 -0400
Merge topic 'copyright-by-contributors' into next
16fddd04 Copyright.txt: Add notice of copyright by contributors
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=16fddd040338061d5ed3b652fdbb1f6fc3d99240
commit 16fddd040338061d5ed3b652fdbb1f6fc3d99240
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 26 11:04:16 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Sep 26 11:44:34 2016 -0400
Copyright.txt: Add notice of copyright by contributors
We already have a note about source-level copyright by contributors.
Update the top-level notice to mention "Contributors" explicitly (but
not individually).
diff --git a/Copyright.txt b/Copyright.txt
index f99998f..7b06205 100644
--- a/Copyright.txt
+++ b/Copyright.txt
@@ -1,5 +1,5 @@
CMake - Cross Platform Makefile Generator
-Copyright 2000-2016 Kitware, Inc.
+Copyright 2000-2016 Kitware, Inc. and Contributors
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
More information about the Cmake-commits
mailing list