[Cmake-commits] CMake branch, master, updated. v3.2.2-885-gdf302bc

[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  df302bcc550e344f4cbe07f7941e1315dfd86ca5 (commit)
       via  258ba82882545d70162c865e56fc024ccd9cd164 (commit)
       via  acd4f01fd81c4303cad37128a75ca390c1a42571 (commit)
      from  6b229b48020987e71b35d84d43bcd4e73515d8b7 (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=df302bcc550e344f4cbe07f7941e1315dfd86ca5
commit df302bcc550e344f4cbe07f7941e1315dfd86ca5
Merge: 6b229b4 258ba82
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 22 11:16:33 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 22 11:16:33 2015 -0400

    Merge topic 'autogen-no-rcc-stderr'
    
    258ba828 QtAutogen: Process 'rcc --list' stdout and stderr separately (#15523)
    acd4f01f cmQtAutoGenerators: Split CR stripping out to helper function


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

Summary of changes:
 Source/cmQtAutoGenerators.cxx                      |   61 ++++++++++++--------
 Tests/QtAutogen/CMakeLists.txt                     |    9 +++
 Tests/QtAutogen/generated.txt.in                   |    1 +
 ...enerated_file.qrc => generated_resource.qrc.in} |    2 +-
 4 files changed, 48 insertions(+), 25 deletions(-)
 create mode 100644 Tests/QtAutogen/generated.txt.in
 copy Tests/QtAutogen/{not_generated_file.qrc => generated_resource.qrc.in} (68%)


hooks/post-receive
-- 
CMake