[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2811-g2aa03d3

[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  2aa03d35657cac786a6f6464a7a7efe6d9bbcf40 (commit)
       via  1c1c0e444d9911695a8976191a075edfb6c17951 (commit)
      from  9ae20522b7afa771d9ecf23e05d42b0e85da636a (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=2aa03d35657cac786a6f6464a7a7efe6d9bbcf40
commit 2aa03d35657cac786a6f6464a7a7efe6d9bbcf40
Merge: 9ae2052 1c1c0e4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 6 14:17:22 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 6 14:17:22 2014 -0400

    Merge topic 'dev/faster-evis' into next
    
    1c1c0e44 Tests: Fix RunCMake.Syntax NameWithCarriageReturnQuoted case


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c1c0e444d9911695a8976191a075edfb6c17951
commit 1c1c0e444d9911695a8976191a075edfb6c17951
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 6 14:05:10 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue May 6 14:17:46 2014 -0400

    Tests: Fix RunCMake.Syntax NameWithCarriageReturnQuoted case
    
    Fix expected output after parent commit.

diff --git a/Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted-stderr.txt b/Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted-stderr.txt
index d93b9db..f5e03ed 100644
--- a/Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted-stderr.txt
+++ b/Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted-stderr.txt
@@ -7,6 +7,6 @@
 
     \${var\\rwith\\rcarriagereturn}
 
-  syntax error, unexpected cal_SYMBOL, expecting } \(26\)
+  syntax error, unexpected cal_SYMBOL, expecting } \(7\)
 Call Stack \(most recent call first\):
   CMakeLists.txt:3 \(include\)$

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

Summary of changes:
 Tests/RunCMake/Syntax/NameWithCarriageReturnQuoted-stderr.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake