[Cmake-commits] CMake branch, master, updated. v3.1.0-926-g17cfa09

[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  17cfa09eb2a78349a6471e4719bc933dd0625d9e (commit)
       via  0238d0c397e52a82f20a0b7bf5aad9a07f36133c (commit)
       via  bda4f0b661018b32aefdb14887d8137e7a4fd118 (commit)
       via  a02fbec5f3eabf7847583a7f45c092ef6c066546 (commit)
      from  1ef4e3ab4534d0b24031045a476ff223574c38ec (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=17cfa09eb2a78349a6471e4719bc933dd0625d9e
commit 17cfa09eb2a78349a6471e4719bc933dd0625d9e
Merge: 1ef4e3a 0238d0c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 20 09:31:59 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 20 09:31:59 2015 -0500

    Merge topic 'cmake-labels-json'
    
    0238d0c3 cmake: Generate an internal 'Labels.json' file next to 'Labels.txt'
    bda4f0b6 jsoncpp: Add headers to help CMake include in-source jsoncpp headers
    a02fbec5 jsoncpp: Drop doxygen comments that cause Clang warnings


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

Summary of changes:
 Source/CMakeLists.txt                              |    4 ++-
 Source/cmGlobalGenerator.cxx                       |   26 +++++++++++++++++++-
 .../{cm_jsoncpp_reader.h => cm_jsoncpp_value.h}    |    6 ++---
 .../{cm_jsoncpp_reader.h => cm_jsoncpp_writer.h}   |    6 ++---
 Utilities/cmjsoncpp/include/json/reader.h          |    2 --
 Utilities/cmjsoncpp/include/json/writer.h          |    1 -
 6 files changed, 34 insertions(+), 11 deletions(-)
 copy Utilities/{cm_jsoncpp_reader.h => cm_jsoncpp_value.h} (86%)
 copy Utilities/{cm_jsoncpp_reader.h => cm_jsoncpp_writer.h} (86%)


hooks/post-receive
-- 
CMake