[Cmake-commits] CMake branch, next, updated. v3.5.2-1058-gf7eb774

[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  f7eb7745dd8ed7b08a8456059a84a99ac3f0354e (commit)
       via  c99f564c352f49b5ef87a6cedffb18368bc01c6d (commit)
      from  59d754def532ee6fdb086a28ce1a77b61146c47a (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=f7eb7745dd8ed7b08a8456059a84a99ac3f0354e
commit f7eb7745dd8ed7b08a8456059a84a99ac3f0354e
Merge: 59d754d c99f564
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 22 08:48:53 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 22 08:48:53 2016 -0400

    Merge topic 'autogen-updates' into next
    
    c99f564c fixup! Autogen: Check added for name collisions of generated moc files


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c99f564c352f49b5ef87a6cedffb18368bc01c6d
commit c99f564c352f49b5ef87a6cedffb18368bc01c6d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 22 08:48:32 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 22 08:48:32 2016 -0400

    fixup! Autogen: Check added for name collisions of generated moc files

diff --git a/Help/release/dev/automoc-diagnostics.rst b/Help/release/dev/automoc-diagnostics.rst
index 439d2ff..d89f2e1 100644
--- a/Help/release/dev/automoc-diagnostics.rst
+++ b/Help/release/dev/automoc-diagnostics.rst
@@ -3,4 +3,4 @@ automoc-diagnostics
 
 * :prop_tgt:`AUTOMOC` now diagnoses name collisions when multiple source
   files in different directories use ``#include <moc_foo.cpp>`` with the
-  same name (because the generated ``moc_foo.cpp`` files would collide.
+  same name (because the generated ``moc_foo.cpp`` files would collide).

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

Summary of changes:
 Help/release/dev/automoc-diagnostics.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake