[Cmake-commits] CMake branch, next, updated. v3.0.0-rc6-3489-gcd07a00
Brad King
brad.king at kitware.com
Tue Jun 3 09:28:58 EDT 2014
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 cd07a009b75757fd6739b1fa9243293c241d7552 (commit)
via 8da0a75ba2196465cea442e5a5a5f905fc2906d1 (commit)
from 49679c413cd9ab75e19bc0754da835b76a94fb93 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cd07a009b75757fd6739b1fa9243293c241d7552
commit cd07a009b75757fd6739b1fa9243293c241d7552
Merge: 49679c4 8da0a75
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 3 09:28:57 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 3 09:28:57 2014 -0400
Merge topic 'cmake-credits' into next
8da0a75b Simplify and clarify credit text and link
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8da0a75ba2196465cea442e5a5a5f905fc2906d1
commit 8da0a75ba2196465cea442e5a5a5f905fc2906d1
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 3 09:19:57 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jun 3 09:24:26 2014 -0400
Simplify and clarify credit text and link
Use the name "Kitware" rather than "Kitware, Inc." to simplify the text.
Provide a CMake-specific URL.
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 76561b9..3499da8 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -4,10 +4,10 @@ Contributing to CMake
Community
=========
-CMake is maintained by `Kitware, Inc.`_ and developed in
+CMake is maintained and supported by `Kitware`_ and developed in
collaboration with a productive community of contributors.
-.. _`Kitware, Inc.`: http://www.kitware.com
+.. _`Kitware`: http://www.kitware.com/cmake
The preferred entry point for new contributors is the mailing list.
Please subscribe and post to the `CMake Developers List`_ to offer
diff --git a/README.rst b/README.rst
index 1b5b0c3..e91b209 100644
--- a/README.rst
+++ b/README.rst
@@ -11,10 +11,10 @@ For full documentation visit the `CMake Home Page`_ and the
.. _`CMake Home Page`: http://www.cmake.org
.. _`CMake Documentation Page`: http://www.cmake.org/cmake/help/documentation.html
-CMake is maintained by `Kitware, Inc.`_ and developed in
+CMake is maintained and supported by `Kitware`_ and developed in
collaboration with a productive community of contributors.
-.. _`Kitware, Inc.`: http://www.kitware.com
+.. _`Kitware`: http://www.kitware.com/cmake
License
=======
diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx
index f62afd6..10879c0 100644
--- a/Source/QtDialog/CMakeSetupDialog.cxx
+++ b/Source/QtDialog/CMakeSetupDialog.cxx
@@ -812,7 +812,7 @@ void CMakeSetupDialog::doAbout()
{
QString msg = tr(
"CMake %1 (cmake.org).\n"
- "CMake suite maintained by Kitware, Inc. (kitware.com).\n"
+ "CMake suite maintained and supported by Kitware (kitware.com/cmake).\n"
"Distributed under terms of the BSD 3-Clause License.\n"
"\n"
"CMake GUI maintained by csimsoft,\n"
-----------------------------------------------------------------------
Summary of changes:
CONTRIBUTING.rst | 4 ++--
README.rst | 4 ++--
Source/QtDialog/CMakeSetupDialog.cxx | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list