[Cmake-commits] CMake branch, next, updated. v2.8.12.2-1717-g68cedaf

[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  68cedaf0637cb9ec4714cea185bca72954409c89 (commit)
       via  4d6cd67e3c1ffac6d3b99799a2c0d1ef17abd24b (commit)
      from  a9254a414b49b044d3aea8041c7e6fc636bf3d5c (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=68cedaf0637cb9ec4714cea185bca72954409c89
commit 68cedaf0637cb9ec4714cea185bca72954409c89
Merge: a9254a4 4d6cd67
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 25 11:12:33 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 25 11:12:33 2014 -0500

    Merge topic 'find-hg-opencl' into next
    
    4d6cd67e FindHg: Drop duplicate TortoiseHg registry entry


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4d6cd67e3c1ffac6d3b99799a2c0d1ef17abd24b
commit 4d6cd67e3c1ffac6d3b99799a2c0d1ef17abd24b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 25 11:12:39 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 25 11:12:39 2014 -0500

    FindHg: Drop duplicate TortoiseHg registry entry
    
    The find_program command automatically searches both 32-bit and 64-bit
    registry views.

diff --git a/Modules/FindHg.cmake b/Modules/FindHg.cmake
index 5d7d529..c418afd 100644
--- a/Modules/FindHg.cmake
+++ b/Modules/FindHg.cmake
@@ -57,7 +57,6 @@ find_program(HG_EXECUTABLE
   NAMES hg
   PATHS
     [HKEY_LOCAL_MACHINE\\Software\\TortoiseHG]
-    [HKEY_LOCAL_MACHINE\\Software\\Wow6432Node\\TortoiseHG]
   PATH_SUFFIXES Mercurial
   DOC "hg command line client"
   )

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

Summary of changes:
 Modules/FindHg.cmake |    1 -
 1 file changed, 1 deletion(-)


hooks/post-receive
-- 
CMake