[Cmake-commits] CMake branch, master, updated. v3.0.0-rc3-366-g9b536b9

[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  9b536b914bd665ea55d3f7c1f3e391a060fb9e0e (commit)
       via  f1fd3714a40327c461633b64d82f6815ed3e7817 (commit)
      from  bcd4d0ced8a8161822233f66b54b41d388e5fc1c (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=9b536b914bd665ea55d3f7c1f3e391a060fb9e0e
commit 9b536b914bd665ea55d3f7c1f3e391a060fb9e0e
Merge: bcd4d0c f1fd371
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 26 13:24:33 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 26 13:24:33 2014 -0400

    Merge topic 'report-INTERFACE-type-in-conflict'
    
    f1fd3714 cmMakefile: Report type of INTERFACE library in conflict.


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

Summary of changes:
 Source/cmMakefile.cxx |    3 +++
 1 file changed, 3 insertions(+)


hooks/post-receive
-- 
CMake