Преглед на файлове

Begin post-3.3 development

Brad King преди 11 години
родител
ревизия
d3bb5da929
променени са 3 файла, в които са добавени 11 реда и са изтрити 2 реда
  1. 7 0
      Help/release/dev/0-sample-topic.rst
  2. 2 0
      Help/release/index.rst
  3. 2 2
      Source/CMakeVersion.cmake

+ 7 - 0
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.

+ 2 - 0
Help/release/index.rst

@@ -5,6 +5,8 @@ CMake Release Notes
   This file should include the adjacent "dev.txt" file
   This file should include the adjacent "dev.txt" file
   in development versions but not in release versions.
   in development versions but not in release versions.
 
 
+.. include:: dev.txt
+
 Releases
 Releases
 ========
 ========
 
 

+ 2 - 2
Source/CMakeVersion.cmake

@@ -1,5 +1,5 @@
 # CMake version number components.
 # CMake version number components.
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MINOR 3)
 set(CMake_VERSION_MINOR 3)
-set(CMake_VERSION_PATCH 0)
-set(CMake_VERSION_RC 1)
+set(CMake_VERSION_PATCH 20150602)
+#set(CMake_VERSION_RC 1)