[Cmake-commits] CMake branch, master, updated. v2.8.12-322-gad9c5c5

[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  ad9c5c54f3b4898c7f04620fe95a74a043624dc2 (commit)
       via  4fd60241c828cceb2dba5219dfdaa7b61268e700 (commit)
      from  ca498f01927a00cbad9984e48a357b14a9adc773 (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=ad9c5c54f3b4898c7f04620fe95a74a043624dc2
commit ad9c5c54f3b4898c7f04620fe95a74a043624dc2
Merge: ca498f0 4fd6024
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 17 08:57:23 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 17 08:57:23 2013 -0400

    Merge topic 'print-CMP0022-content-conflict-test'
    
    4fd6024 CMP0022: Add unit test for null pointer check and message.


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

Summary of changes:
 ...esult.txt => CMP0022-WARN-empty-old-result.txt} |    0
 ...tderr.txt => CMP0022-WARN-empty-old-stderr.txt} |    2 +-
 ...022-WARN.cmake => CMP0022-WARN-empty-old.cmake} |    5 ++---
 Tests/RunCMake/CMP0022/RunCMakeTest.cmake          |    1 +
 4 files changed, 4 insertions(+), 4 deletions(-)
 copy Tests/RunCMake/CMP0022/{CMP0022-WARN-static-result.txt => CMP0022-WARN-empty-old-result.txt} (100%)
 copy Tests/RunCMake/CMP0022/{CMP0022-WARN-tll-stderr.txt => CMP0022-WARN-empty-old-stderr.txt} (97%)
 copy Tests/RunCMake/CMP0022/{CMP0022-WARN.cmake => CMP0022-WARN-empty-old.cmake} (62%)


hooks/post-receive
-- 
CMake