[Cmake-commits] CMake branch, master, updated. v3.0.2-2042-gcea13d5

[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  cea13d5536ef77fb93ef8ae5abfa9c81920140e7 (commit)
       via  f4c5eade787f4f0a6e33fe029c2816580db06041 (commit)
      from  c11a342e652be170e232d100474836a239037623 (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=cea13d5536ef77fb93ef8ae5abfa9c81920140e7
commit cea13d5536ef77fb93ef8ae5abfa9c81920140e7
Merge: c11a342 f4c5ead
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 13 08:21:04 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 13 08:21:04 2014 -0400

    Merge topic 'fix-ninja-rc-include-flags'
    
    f4c5eade Ninja: Fix RC include directories regression


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

Summary of changes:
 Source/cmLocalGenerator.cxx          |    9 ++++++---
 Source/cmLocalGenerator.h            |    4 +++-
 Source/cmLocalNinjaGenerator.cxx     |    5 +++--
 Source/cmLocalNinjaGenerator.h       |    3 ++-
 Source/cmMakefileTargetGenerator.cxx |    2 +-
 Tests/VSResource/CMakeLists.txt      |   14 +++++++++++++-
 Tests/VSResource/include.rc.in       |    1 +
 Tests/VSResource/test.rc             |    3 +++
 8 files changed, 32 insertions(+), 9 deletions(-)
 create mode 100644 Tests/VSResource/include.rc.in


hooks/post-receive
-- 
CMake