[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6642-g95d36c3

Brad King brad.king at kitware.com
Fri Jan 3 11:37:18 EST 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  95d36c313fe85809cfaba3b5f5cf67ec97c21e5d (commit)
       via  9e41eb68ec9d60bcaf39e6442dda593d4135abd7 (commit)
      from  4f13412ea4f458106a20e9aa5f7c9835f8d26234 (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=95d36c313fe85809cfaba3b5f5cf67ec97c21e5d
commit 95d36c313fe85809cfaba3b5f5cf67ec97c21e5d
Merge: 4f13412 9e41eb6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 3 11:37:16 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 3 11:37:16 2014 -0500

    Merge topic 'fix-text-typos' into next
    
    9e41eb6 Fix wording of "the the" typos throughout text


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9e41eb68ec9d60bcaf39e6442dda593d4135abd7
commit 9e41eb68ec9d60bcaf39e6442dda593d4135abd7
Author:     Ruslan Baratov <ruslan_baratov at yahoo.com>
AuthorDate: Thu Jan 2 21:52:18 2014 +0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 3 11:35:32 2014 -0500

    Fix wording of "the the" typos throughout text

diff --git a/Modules/FindDevIL.cmake b/Modules/FindDevIL.cmake
index 22a82b5..865d061 100644
--- a/Modules/FindDevIL.cmake
+++ b/Modules/FindDevIL.cmake
@@ -49,7 +49,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
 
 find_path(IL_INCLUDE_DIR il.h
   PATH_SUFFIXES include IL
-  DOC "The path the the directory that contains il.h"
+  DOC "The path to the directory that contains il.h"
 )
 
 #message("IL_INCLUDE_DIR is ${IL_INCLUDE_DIR}")
diff --git a/Modules/FindSDL.cmake b/Modules/FindSDL.cmake
index ec1f881..3905e54 100644
--- a/Modules/FindSDL.cmake
+++ b/Modules/FindSDL.cmake
@@ -15,7 +15,7 @@
 #
 #
 #
-# This module responds to the the flag:
+# This module responds to the flag:
 #
 # ::
 #
@@ -23,7 +23,7 @@
 #     If this is defined, then no SDL_main will be linked in because
 #     only applications need main().
 #     Otherwise, it is assumed you are building an application and this
-#     module will attempt to locate and set the the proper link flags
+#     module will attempt to locate and set the proper link flags
 #     as part of the returned SDL_LIBRARY variable.
 #
 #
diff --git a/Tests/CTestTest/test.cmake.in b/Tests/CTestTest/test.cmake.in
index 214bff8..ab39b88 100644
--- a/Tests/CTestTest/test.cmake.in
+++ b/Tests/CTestTest/test.cmake.in
@@ -6,7 +6,7 @@
 # this is the cvs module name that should be checked out
 set (CTEST_MODULE_NAME SmallAndFast)
 
-# these are the the name of the source and binary directory on disk.
+# these are the name of the source and binary directory on disk.
 # They will be appended to DASHBOARD_ROOT
 set (CTEST_SOURCE_NAME SmallAndFast)
 set (CTEST_BINARY_NAME SmallAndFastBuild)
diff --git a/Utilities/cmlibarchive/libarchive/archive_write_set_options.3 b/Utilities/cmlibarchive/libarchive/archive_write_set_options.3
index 9d60515..f8fb039 100644
--- a/Utilities/cmlibarchive/libarchive/archive_write_set_options.3
+++ b/Utilities/cmlibarchive/libarchive/archive_write_set_options.3
@@ -255,7 +255,7 @@ If the
 .Ar value
 is
 .Cm hd ,
-then the the boot image is assumed to be a bootable hard disk image.
+then the boot image is assumed to be a bootable hard disk image.
 If the
 .Ar value
 is

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

Summary of changes:
 Modules/FindDevIL.cmake                            |    2 +-
 Modules/FindSDL.cmake                              |    4 ++--
 Tests/CTestTest/test.cmake.in                      |    2 +-
 .../libarchive/archive_write_set_options.3         |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list