[Cmake-commits] CMake branch, master, updated. v3.0.0-rc6-960-g6ca2134

[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  6ca21345c85324e01b49975706bbac2bcde91267 (commit)
       via  9afcecaf32acb4333b33d46522f98457bfa8856d (commit)
      from  c5315524629bea99ccaaa4e0e666fe4918f66064 (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=6ca21345c85324e01b49975706bbac2bcde91267
commit 6ca21345c85324e01b49975706bbac2bcde91267
Merge: c531552 9afceca
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 27 09:46:38 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 27 09:46:38 2014 -0400

    Merge topic 'revise-CTestTestTimeout'
    
    9afcecaf Tests: Try to make CTestTestTimeout more robust


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

Summary of changes:
 Tests/CMakeLists.txt                  |    2 +-
 Tests/CTestTestTimeout/CMakeLists.txt |   12 ++++--------
 Tests/CTestTestTimeout/check.cmake    |    9 ---------
 Tests/CTestTestTimeout/sleep.c        |   21 +++++++++++++++++++++
 Tests/CTestTestTimeout/test.cmake.in  |   13 +++++++++++++
 Tests/CTestTestTimeout/timeout.c      |   18 ------------------
 Tests/CTestTestTimeout/timeout.cmake  |    2 +-
 7 files changed, 40 insertions(+), 37 deletions(-)
 delete mode 100644 Tests/CTestTestTimeout/check.cmake
 create mode 100644 Tests/CTestTestTimeout/sleep.c
 delete mode 100644 Tests/CTestTestTimeout/timeout.c


hooks/post-receive
-- 
CMake