diff options
| author | Brad King <brad.king@kitware.com> | 2010-06-15 18:33:11 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2010-06-15 18:33:11 (GMT) |
| commit | 23a8f31e3fd103a6da716055f4e9cae653b5f851 (patch) | |
| tree | db3dad3a798e6895c063e77ec85e9fd3c43584be | |
| parent | 4f4cce5637636c656e20df1df3ed642dd1d205c5 (diff) | |
| parent | 9949f9fbff2f635285857d2fa74fe769a11eb125 (diff) | |
| download | CMake-23a8f31e3fd103a6da716055f4e9cae653b5f851.zip CMake-23a8f31e3fd103a6da716055f4e9cae653b5f851.tar.gz CMake-23a8f31e3fd103a6da716055f4e9cae653b5f851.tar.bz2 | |
Merge branch 'release'
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | ChangeLog.manual | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bd90163..21a9666 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -339,9 +339,9 @@ ENDMACRO (CMAKE_BUILD_UTILITIES) # The CMake version number. SET(CMake_VERSION_MAJOR 2) SET(CMake_VERSION_MINOR 8) -SET(CMake_VERSION_PATCH 1) -#SET(CMake_VERSION_TWEAK 0) -#SET(CMake_VERSION_RC 1) +SET(CMake_VERSION_PATCH 2) +SET(CMake_VERSION_TWEAK 0) +SET(CMake_VERSION_RC 1) # Releases define a tweak level. IF(DEFINED CMake_VERSION_TWEAK) diff --git a/ChangeLog.manual b/ChangeLog.manual index b935860..db8e992 100644 --- a/ChangeLog.manual +++ b/ChangeLog.manual @@ -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 mingw-w64 - Build on old Sun (#10550, #10543) |