summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-01-28 18:52:58 (GMT)
committerBrad King <brad.king@kitware.com>2014-01-28 18:52:58 (GMT)
commit8157f58d024547aef221259b65ce2c502ee514d4 (patch)
tree5dba819226e3e2d87fe9bdfb9c12b08a95f37804
parent2dfb517f7382a24961ba75028eeec4827e3c526f (diff)
parent0b3781e4c497566acaa504d4106d11c02a642501 (diff)
downloadCMake-8157f58d024547aef221259b65ce2c502ee514d4.zip
CMake-8157f58d024547aef221259b65ce2c502ee514d4.tar.gz
CMake-8157f58d024547aef221259b65ce2c502ee514d4.tar.bz2
Merge branch 'release'
-rw-r--r--ChangeLog.manual17
1 files changed, 17 insertions, 0 deletions
diff --git a/ChangeLog.manual b/ChangeLog.manual
index 5d2dc8b..b389d8b 100644
--- a/ChangeLog.manual
+++ b/ChangeLog.manual
@@ -1,3 +1,20 @@
+Changes in CMake 2.8.12.2 (since 2.8.12.1)
+------------------------------------------
+Brad King (4):
+ VS: Map /Fd to ProgramDataBaseFileName for VS 7,8,9 (#14577)
+ Replace <OBJECT_DIR> rule placeholder consistently (#14667)
+ VS: Convert include path to backslashes for VS >= 10
+ Revert "Ninja: Track configured files so we can regenerate them."
+
+Rolf Eike Beer (1):
+ FindOpenMP: fix detecting compilers that do not need any special flag (#14567)
+
+Ruslan Baratov (1):
+ Xcode: Fix storyboard view
+
+Ted Kremenek (1):
+ CMakeDetermineCompilerId: Fix compiler line match for Xcode 5.1
+
Changes in CMake 2.8.12.1 (since 2.8.12)
----------------------------------------
Brad King (9):