summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2011-06-21 11:59:34 -0400
committerDavid Cole <david.cole@kitware.com>2011-06-21 11:59:34 -0400
commit4da6bea9e234f364ff510d3760c4fb05c2d2e214 (patch)
tree7c7547d16c8ab1e96742089ae1eff21a3391d5ef /CMakeLists.txt
parentd9d7e8ffa512584c837339c8caa14ca1a807078a (diff)
parent34cfc880b1ba8417d1007874807a9a98ac3e8efb (diff)
downloadcmake-4da6bea9e234f364ff510d3760c4fb05c2d2e214.tar.gz
Merge branch 'release'
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93822ef0e4..d50bcaee42 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -416,9 +416,9 @@ ENDIF()
# The CMake version number.
SET(CMake_VERSION_MAJOR 2)
SET(CMake_VERSION_MINOR 8)
-SET(CMake_VERSION_PATCH 4)
-#SET(CMake_VERSION_TWEAK 0)
-#SET(CMake_VERSION_RC 1)
+SET(CMake_VERSION_PATCH 5)
+SET(CMake_VERSION_TWEAK 0)
+SET(CMake_VERSION_RC 2)
# Releases define a tweak level.
IF(DEFINED CMake_VERSION_TWEAK)