[Cmake-commits] CMake branch, master, updated. v2.8.12.1-967-g7974dce

[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  7974dced73a9efaf2b268f8c3a647054c75ff401 (commit)
       via  bd11de085757f170c5880d99291048b9f512a120 (commit)
      from  6f29fdd7cd1272f0714fce5028ff9d73e9805ea6 (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=7974dced73a9efaf2b268f8c3a647054c75ff401
commit 7974dced73a9efaf2b268f8c3a647054c75ff401
Merge: 6f29fdd bd11de0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 20 09:41:32 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 20 09:41:32 2013 -0500

    Merge topic 'make-entry-no-parallel'
    
    bd11de0 Makefile: Allow "gmake target1 target2 -j" (#14312)


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

Summary of changes:
 Source/cmGlobalBorlandMakefileGenerator.h |    2 ++
 Source/cmGlobalUnixMakefileGenerator3.h   |    3 +++
 Source/cmGlobalWatcomWMakeGenerator.h     |    2 ++
 Source/cmLocalUnixMakefileGenerator3.cxx  |   11 +++++++++++
 4 files changed, 18 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake