[Cmake-commits] CMake branch, master, updated. v3.5.0-rc2-93-g135a0df

[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  135a0df525851e6fd35efc74c4b86309dfc381de (commit)
       via  9beb2744d7685fca9cd5717308d4457dffdefcdc (commit)
      from  ede2a6ea6b6ff201ea1b2e2f7943b301a28b1df5 (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=135a0df525851e6fd35efc74c4b86309dfc381de
commit 135a0df525851e6fd35efc74c4b86309dfc381de
Merge: ede2a6e 9beb274
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 18 10:07:56 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 18 10:07:56 2016 -0500

    Merge topic 'automoc-src-per-dir'
    
    9beb2744 Automoc: Fix support of files with the same name (#12873)


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

Summary of changes:
 Source/cmQtAutoGenerators.cxx       |   35 ++++++++++++++++++++++++++++++++---
 Tests/QtAutogen/Adir/CMakeLists.txt |    2 +-
 Tests/QtAutogen/Adir/bar/foo.cpp    |    4 ++++
 Tests/QtAutogen/Adir/bar/foo.h      |   10 ++++++++++
 Tests/QtAutogen/Adir/foo.cpp        |    4 ++++
 Tests/QtAutogen/Adir/foo.h          |    8 ++++++++
 6 files changed, 59 insertions(+), 4 deletions(-)
 create mode 100644 Tests/QtAutogen/Adir/bar/foo.cpp
 create mode 100644 Tests/QtAutogen/Adir/bar/foo.h
 create mode 100644 Tests/QtAutogen/Adir/foo.cpp
 create mode 100644 Tests/QtAutogen/Adir/foo.h


hooks/post-receive
-- 
CMake