diff options
| author | Brad King <brad.king@kitware.com> | 2014-06-03 13:30:39 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-06-03 13:30:39 (GMT) |
| commit | 922f47979afd8bee43f6810c53146aa6d34b44ab (patch) | |
| tree | a485fc29a830947bf96b8fe3c7063f9c9104650b | |
| parent | 910849d176876ae7da821c0db1a5b592e1dfd2f8 (diff) | |
| parent | 8da0a75ba2196465cea442e5a5a5f905fc2906d1 (diff) | |
| download | CMake-922f47979afd8bee43f6810c53146aa6d34b44ab.zip CMake-922f47979afd8bee43f6810c53146aa6d34b44ab.tar.gz CMake-922f47979afd8bee43f6810c53146aa6d34b44ab.tar.bz2 | |
Merge branch 'cmake-credits' into release
| -rw-r--r-- | CONTRIBUTING.rst | 4 | ||||
| -rw-r--r-- | README.rst | 4 | ||||
| -rw-r--r-- | Source/QtDialog/CMakeSetupDialog.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
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 @@ -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" |