summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rw-r--r--ChangeLog.manual21
2 files changed, 22 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d50bcae..34315fa 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 2)
+SET(CMake_VERSION_RC 3)
# Releases define a tweak level.
IF(DEFINED CMake_VERSION_TWEAK)
diff --git a/ChangeLog.manual b/ChangeLog.manual
index f642734..e9694f4 100644
--- a/ChangeLog.manual
+++ b/ChangeLog.manual
@@ -1,3 +1,24 @@
+Changes in CMake 2.8.5-rc3 (since 2.8.5-rc2)
+--------------------------------------------
+Brad King (3):
+ KWSys: Recognize color TERM=screen-256color-bce (#12287)
+ find_library: Use lib->lib64 conversion in CXX-only projects (#12247,#12248)
+ libarchive: Install COPYING with CMake documentation
+
+Christoph Höger (1):
+ FindJNI: Search in Fedora arch-specific JVM location (#12276)
+
+Julien Malik (1):
+ FindSWIG: Use NAMES in find_program directives (#12280)
+
+Modestas Vainius (1):
+ Documentation: Fix spelling / formatting errors (#12287)
+
+Philip Lowman (3):
+ FindBoost: Fixes #12188
+ FindBoost: Also search for 1.46.1
+ Detect VS 2010 SP1, faster and more robust detection
+
Changes in CMake 2.8.5-rc2 (since 2.8.5-rc1)
--------------------------------------------
Bill Hoffman (6):