[Cmake-commits] CMake branch, next, updated. v3.6.0-rc3-601-g50c0cf8

[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  50c0cf86316fa416cb711da4f69dab9f18dafcea (commit)
       via  a9252441b3c03572808b15155f31b4e60b150d0e (commit)
      from  e0a1084ce058cff10e6359f85f86752e85437e16 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=50c0cf86316fa416cb711da4f69dab9f18dafcea
commit 50c0cf86316fa416cb711da4f69dab9f18dafcea
Merge: e0a1084 a925244
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 29 09:10:20 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 29 09:10:20 2016 -0400

    Merge topic 'GenerateExportHeader-custom-content' into next
    
    a9252441 Tests: Run clang-format on GenerateExportHeader code


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a9252441b3c03572808b15155f31b4e60b150d0e
commit a9252441b3c03572808b15155f31b4e60b150d0e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 29 09:09:54 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 29 09:09:54 2016 -0400

    Tests: Run clang-format on GenerateExportHeader code

diff --git a/Tests/Module/GenerateExportHeader/lib_shared_and_static/libshared_and_static.cpp b/Tests/Module/GenerateExportHeader/lib_shared_and_static/libshared_and_static.cpp
index 83b8f98..846c207 100644
--- a/Tests/Module/GenerateExportHeader/lib_shared_and_static/libshared_and_static.cpp
+++ b/Tests/Module/GenerateExportHeader/lib_shared_and_static/libshared_and_static.cpp
@@ -2,7 +2,7 @@
 #include "libshared_and_static.h"
 
 #ifndef MY_CUSTOM_CONTENT_ADDED
-# error "MY_CUSTOM_CONTENT_ADDED not defined!"
+#error "MY_CUSTOM_CONTENT_ADDED not defined!"
 #endif
 
 int LibsharedAndStatic::libshared_and_static() const

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

Summary of changes:
 .../lib_shared_and_static/libshared_and_static.cpp                   |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake