summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2011-07-08 11:12:50 (GMT)
committerDavid Cole <david.cole@kitware.com>2011-07-08 11:12:50 (GMT)
commitee1c6a5b0674b77a05c84ac208044f79d25826e5 (patch)
tree84164849b1aedfa6b2f09508029caaf8cc2848de
parent5a26d3a525a59c7d98d52f0063a746a6d901794f (diff)
downloadCMake-2.8.5.zip
CMake-2.8.5.tar.gz
CMake-2.8.5.tar.bz2
CMake 2.8.5v2.8.5
-rw-r--r--CMakeLists.txt2
-rw-r--r--ChangeLog.manual6
2 files changed, 7 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 34315fa..15620a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -418,7 +418,7 @@ SET(CMake_VERSION_MAJOR 2)
SET(CMake_VERSION_MINOR 8)
SET(CMake_VERSION_PATCH 5)
SET(CMake_VERSION_TWEAK 0)
-SET(CMake_VERSION_RC 3)
+#SET(CMake_VERSION_RC 3)
# Releases define a tweak level.
IF(DEFINED CMake_VERSION_TWEAK)
diff --git a/ChangeLog.manual b/ChangeLog.manual
index 02a4307..a00ce00 100644
--- a/ChangeLog.manual
+++ b/ChangeLog.manual
@@ -1,3 +1,9 @@
+Changes in CMake 2.8.5 (since 2.8.5-rc3)
+--------------------------------------------
+Brad King (1):
+ Revert "Add a new function SWIG_GET_WRAPPER_DEPENDENCIES to UseSWIG.cmake"
+ (this revert means that issue #4147 has been re-opened)
+
Changes in CMake 2.8.5-rc3 (since 2.8.5-rc2)
--------------------------------------------
Bill Hoffman (4):