Explorar o código

Merge branch 'release'

Brad King %!s(int64=11) %!d(string=hai) anos
pai
achega
08f29c6008
Modificáronse 3 ficheiros con 3 adicións e 12 borrados
  1. 0 7
      Help/release/dev/0-sample-topic.rst
  2. 0 2
      Help/release/index.rst
  3. 3 3
      Source/CMakeVersion.cmake

+ 0 - 7
Help/release/dev/0-sample-topic.rst

@@ -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.

+ 0 - 2
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
 ========
 

+ 3 - 3
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)