[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5747-ga906935

[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  a9069355537dc03176f3e1bc519766abd3ec6403 (commit)
       via  66963186ae15c744986f011e6f8958f964720882 (commit)
      from  990fd3751fb6f0a06e346db7a791ef40723e4b7f (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=a9069355537dc03176f3e1bc519766abd3ec6403
commit a9069355537dc03176f3e1bc519766abd3ec6403
Merge: 990fd37 6696318
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 25 08:50:57 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 25 08:50:57 2013 -0500

    Merge topic 'KateProjectGenerator2' into next
    
    6696318 kate: Fix documented generator names and add to cmake-generators.7


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=66963186ae15c744986f011e6f8958f964720882
commit 66963186ae15c744986f011e6f8958f964720882
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 25 08:44:39 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 25 08:50:34 2013 -0500

    kate: Fix documented generator names and add to cmake-generators.7

diff --git a/Help/generator/Kate - MinGW Makefiles.rst b/Help/generator/Kate - MinGW Makefiles.rst
index ffdab59..6e46ba9 100644
--- a/Help/generator/Kate - MinGW Makefiles.rst	
+++ b/Help/generator/Kate - MinGW Makefiles.rst	
@@ -1,5 +1,5 @@
-Kate - Unix Makefiles
--------------------------------
+Kate - MinGW Makefiles
+----------------------
 
 Generates Kate project files.
 
diff --git a/Help/generator/Kate - NMake Makefiles.rst b/Help/generator/Kate - NMake Makefiles.rst
index ffdab59..2be4143 100644
--- a/Help/generator/Kate - NMake Makefiles.rst	
+++ b/Help/generator/Kate - NMake Makefiles.rst	
@@ -1,5 +1,5 @@
-Kate - Unix Makefiles
--------------------------------
+Kate - NMake Makefiles
+----------------------
 
 Generates Kate project files.
 
diff --git a/Help/generator/Kate - Ninja.rst b/Help/generator/Kate - Ninja.rst
index ffdab59..8a45e66 100644
--- a/Help/generator/Kate - Ninja.rst	
+++ b/Help/generator/Kate - Ninja.rst	
@@ -1,5 +1,5 @@
-Kate - Unix Makefiles
--------------------------------
+Kate - Ninja
+------------
 
 Generates Kate project files.
 
diff --git a/Help/generator/Kate - Unix Makefiles.rst b/Help/generator/Kate - Unix Makefiles.rst
index ffdab59..1b962fc 100644
--- a/Help/generator/Kate - Unix Makefiles.rst	
+++ b/Help/generator/Kate - Unix Makefiles.rst	
@@ -1,5 +1,5 @@
 Kate - Unix Makefiles
--------------------------------
+---------------------
 
 Generates Kate project files.
 
diff --git a/Help/manual/cmake-generators.7.rst b/Help/manual/cmake-generators.7.rst
index ec1f58a..fe24769 100644
--- a/Help/manual/cmake-generators.7.rst
+++ b/Help/manual/cmake-generators.7.rst
@@ -24,6 +24,10 @@ All Generators
    /generator/Eclipse CDT4 - Unix Makefiles
    /generator/KDevelop3
    /generator/KDevelop3 - Unix Makefiles
+   /generator/Kate - MinGW Makefiles
+   /generator/Kate - Ninja
+   /generator/Kate - NMake Makefiles
+   /generator/Kate - Unix Makefiles
    /generator/MinGW Makefiles
    /generator/MSYS Makefiles
    /generator/Ninja

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

Summary of changes:
 Help/generator/Kate - MinGW Makefiles.rst |    4 ++--
 Help/generator/Kate - NMake Makefiles.rst |    4 ++--
 Help/generator/Kate - Ninja.rst           |    4 ++--
 Help/generator/Kate - Unix Makefiles.rst  |    2 +-
 Help/manual/cmake-generators.7.rst        |    4 ++++
 5 files changed, 11 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake