[Cmake-commits] CMake branch, master, updated. v3.0.2-2054-ga7596fe

[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  a7596fef6e8d6938ce0d7fcba47e896f288b12b4 (commit)
       via  08f29c600877a445ef2f5b4e6125563febeb1e38 (commit)
       via  517e3cd1577843c2468facba4bdb2a864dcbaa5f (commit)
       via  1cb1a282d4153e364d83a6df87329f389b5ace91 (commit)
      from  c113efa7033e27ee3b7a0d4803647830462c3025 (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=a7596fef6e8d6938ce0d7fcba47e896f288b12b4
commit a7596fef6e8d6938ce0d7fcba47e896f288b12b4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 14 09:29:53 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 14 09:29:53 2014 -0400

    Begin post-3.1 development

diff --git a/Help/release/dev/0-sample-topic.rst b/Help/release/dev/0-sample-topic.rst
new file mode 100644
index 0000000..e4cc01e
--- /dev/null
+++ b/Help/release/dev/0-sample-topic.rst
@@ -0,0 +1,7 @@
+0-sample-topic
+--------------
+
+* This is a sample release note for the change in a topic.
+  Developers should add similar notes for each topic branch
+  making a noteworthy change.  Each document should be named
+  and titled to match the topic name to avoid merge conflicts.
diff --git a/Help/release/index.rst b/Help/release/index.rst
index 616a582..abc19b8 100644
--- a/Help/release/index.rst
+++ b/Help/release/index.rst
@@ -5,6 +5,8 @@ CMake Release Notes
   This file should include the adjacent "dev.txt" file
   in development versions but not in release versions.
 
+.. include:: dev.txt
+
 Releases
 ========
 
diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 716f229..b30e3ef 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -1,5 +1,5 @@
 # CMake version number components.
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MINOR 1)
-set(CMake_VERSION_PATCH 0)
-set(CMake_VERSION_RC 1)
+set(CMake_VERSION_PATCH 20141014)
+#set(CMake_VERSION_RC 1)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=08f29c600877a445ef2f5b4e6125563febeb1e38
commit 08f29c600877a445ef2f5b4e6125563febeb1e38
Merge: c113efa 517e3cd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 14 09:28:28 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 14 09:28:28 2014 -0400

    Merge branch 'release'


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=517e3cd1577843c2468facba4bdb2a864dcbaa5f
commit 517e3cd1577843c2468facba4bdb2a864dcbaa5f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 14 09:22:34 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 14 09:22:34 2014 -0400

    CMake 3.1.0-rc1 version update

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index 9c39a11..716f229 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -1,5 +1,5 @@
 # CMake version number components.
 set(CMake_VERSION_MAJOR 3)
-set(CMake_VERSION_MINOR 0)
-set(CMake_VERSION_PATCH 20141014)
-#set(CMake_VERSION_RC 1)
+set(CMake_VERSION_MINOR 1)
+set(CMake_VERSION_PATCH 0)
+set(CMake_VERSION_RC 1)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1cb1a282d4153e364d83a6df87329f389b5ace91
commit 1cb1a282d4153e364d83a6df87329f389b5ace91
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 14 09:21:23 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 14 09:21:23 2014 -0400

    Help: Drop development topic notes to prepare release
    
    Release versions do not have the development topic section of
    the CMake Release Notes index page.

diff --git a/Help/release/dev/0-sample-topic.rst b/Help/release/dev/0-sample-topic.rst
deleted file mode 100644
index e4cc01e..0000000
--- a/Help/release/dev/0-sample-topic.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-0-sample-topic
---------------
-
-* This is a sample release note for the change in a topic.
-  Developers should add similar notes for each topic branch
-  making a noteworthy change.  Each document should be named
-  and titled to match the topic name to avoid merge conflicts.
diff --git a/Help/release/index.rst b/Help/release/index.rst
index abc19b8..616a582 100644
--- a/Help/release/index.rst
+++ b/Help/release/index.rst
@@ -5,8 +5,6 @@ CMake Release Notes
   This file should include the adjacent "dev.txt" file
   in development versions but not in release versions.
 
-.. include:: dev.txt
-
 Releases
 ========
 

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

Summary of changes:
 Source/CMakeVersion.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake