Merge branch 'release'

This commit is contained in:
Brad King 2010-06-15 14:33:11 -04:00
commit 23a8f31e3f
2 changed files with 4 additions and 4 deletions

View File

@ -339,9 +339,9 @@ ENDMACRO (CMAKE_BUILD_UTILITIES)
# The CMake version number. # The CMake version number.
SET(CMake_VERSION_MAJOR 2) SET(CMake_VERSION_MAJOR 2)
SET(CMake_VERSION_MINOR 8) SET(CMake_VERSION_MINOR 8)
SET(CMake_VERSION_PATCH 1) SET(CMake_VERSION_PATCH 2)
#SET(CMake_VERSION_TWEAK 0) SET(CMake_VERSION_TWEAK 0)
#SET(CMake_VERSION_RC 1) SET(CMake_VERSION_RC 1)
# Releases define a tweak level. # Releases define a tweak level.
IF(DEFINED CMake_VERSION_TWEAK) IF(DEFINED CMake_VERSION_TWEAK)

View File

@ -1,4 +1,4 @@
Changes since CMake 2.8.1 Changes in CMake 2.8.2-rc1 (since 2.8.1):
- Build on Tru64 (#10542) - Build on Tru64 (#10542)
- Build on mingw-w64 - Build on mingw-w64
- Build on old Sun (#10550, #10543) - Build on old Sun (#10550, #10543)