[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4265-g5081283

[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, next has been updated
       via  50812834abca50370338b8a86bdcf956406ad370 (commit)
       via  027a0201b270e582d76c1de94a60c19a2a8e505c (commit)
      from  3fbf9485b8fa7786f36da56a86801bf4385457f1 (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=50812834abca50370338b8a86bdcf956406ad370
commit 50812834abca50370338b8a86bdcf956406ad370
Merge: 3fbf948 027a020
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 20 08:23:04 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 20 08:23:04 2013 -0400

    Merge topic 'generate-modern-style' into next
    
    027a020 Merge branch 'test-property-genex' into generate-modern-style


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=027a0201b270e582d76c1de94a60c19a2a8e505c
commit 027a0201b270e582d76c1de94a60c19a2a8e505c
Merge: 33055c4 6a47c37
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 18 14:05:30 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 20 08:20:01 2013 -0400

    Merge branch 'test-property-genex' into generate-modern-style
    
    Resolve conflict in Source/cmTestGenerator.cxx by taking "their" side
    (test-property-genex).  It already accounts for the lower-case change in
    "our" side (generate-modern-style).


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

Summary of changes:


hooks/post-receive
-- 
CMake