[Cmake-commits] CMake branch, master, updated. v3.1.0-715-gb4f62b8

[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  b4f62b875b135f94ccc587f1937db3347fd62198 (commit)
       via  9a673737163a3474c83c8100c57454318344ef1c (commit)
       via  7c585699304ac071cdf7c1b8d7677d38b859e70f (commit)
      from  af0ee419553c501cb81f6210b9b1f724844c3dcd (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=b4f62b875b135f94ccc587f1937db3347fd62198
commit b4f62b875b135f94ccc587f1937db3347fd62198
Merge: af0ee41 9a67373
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 12 08:57:52 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 12 08:57:52 2015 -0500

    Merge topic 'fix-autouic-regression'
    
    9a673737 QtAutoUic: Add a test for the regression in the parent commit.
    7c585699 QtAutoUic: Restore source file AUTOUIC_OPTIONS settings


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

Summary of changes:
 Source/cmSourceFile.cxx        |    2 +-
 Tests/QtAutogen/CMakeLists.txt |    6 ++++++
 Tests/QtAutogen/calwidget.cpp  |    3 +++
 3 files changed, 10 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake