[Cmake-commits] CMake branch, master, updated. v3.1.0-rc2-525-g47c41d9

[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, master has been updated
       via  47c41d902c00acd39c0af668e15bdafb591c8c43 (commit)
       via  97841dad2ba5a79acb0b22db9a01ae45f7b2e80b (commit)
      from  79d1e1347a63aef89441b43ad61303109062a55c (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=47c41d902c00acd39c0af668e15bdafb591c8c43
commit 47c41d902c00acd39c0af668e15bdafb591c8c43
Merge: 79d1e13 97841da
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Dec 8 09:07:14 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 8 09:07:14 2014 -0500

    Merge topic 'file-LOCK-timeout-type'
    
    97841dad file: Use 'long' to represent the parsed LOCK TIMEOUT value


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

Summary of changes:
 Source/cmFileCommand.cxx   |    9 +++++----
 Source/cmFileLock.cxx      |    4 ++--
 Source/cmFileLock.h        |    4 ++--
 Source/cmFileLockPool.cxx  |    8 ++++----
 Source/cmFileLockPool.h    |   10 ++++++----
 Source/cmFileLockUnix.cxx  |    2 +-
 Source/cmFileLockWin32.cxx |    2 +-
 Source/cmSystemTools.cxx   |    7 ++++---
 Source/cmSystemTools.h     |    4 ++--
 9 files changed, 27 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
CMake