[Cmake-commits] CMake branch, next, updated. v2.8.10.1-1054-g002bc84
Brad King
brad.king at kitware.com
Mon Nov 26 13:07:38 EST 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 002bc84129af3af622614258b2065f1ba2c3d3c7 (commit)
via eba77de8752fad6fa5057ccfcdd0234b3c4b178c (commit)
via 17cd6f03c2a3c6917793b2bd1bf77789627bb71d (commit)
from b7b4cd14442a0041812f863904ace90e18341d80 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=002bc84129af3af622614258b2065f1ba2c3d3c7
commit 002bc84129af3af622614258b2065f1ba2c3d3c7
Merge: b7b4cd1 eba77de
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 26 13:07:34 2012 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 26 13:07:34 2012 -0500
Merge topic 'test-release' into next
eba77de Merge branch 'release' into test-release
17cd6f0 Revert "CMake 2.8.10.2"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=eba77de8752fad6fa5057ccfcdd0234b3c4b178c
commit eba77de8752fad6fa5057ccfcdd0234b3c4b178c
Merge: 242e652 17cd6f0
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 26 13:02:25 2012 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 26 13:02:25 2012 -0500
Merge branch 'release' into test-release
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=17cd6f03c2a3c6917793b2bd1bf77789627bb71d
commit 17cd6f03c2a3c6917793b2bd1bf77789627bb71d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 26 13:02:10 2012 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 26 13:02:10 2012 -0500
Revert "CMake 2.8.10.2"
This reverts commit b30d1a261ce2ca325358df61151cedca048a6c1c.
diff --git a/ChangeLog.manual b/ChangeLog.manual
index 7f1eb0d..aa55348 100644
--- a/ChangeLog.manual
+++ b/ChangeLog.manual
@@ -1,14 +1,3 @@
-Changes in CMake 2.8.10.2 (since 2.8.10.1)
-----------------------------------------------
-Alex Neundorf (1):
- Automoc: fix regression #13667, broken build in phonon
-
-Brad King (1):
- Initialize IMPORTED GLOBAL targets on reconfigure (#13702)
-
-Rolf Eike Beer (1):
- FindGettext: fix overwriting result with empty variable (#13691)
-
Changes in CMake 2.8.10.1 (since 2.8.10)
----------------------------------------------
Brad King (5):
diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index c59c618..29ac436 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -2,5 +2,5 @@
set(CMake_VERSION_MAJOR 2)
set(CMake_VERSION_MINOR 8)
set(CMake_VERSION_PATCH 10)
-set(CMake_VERSION_TWEAK 2)
+set(CMake_VERSION_TWEAK 1)
#set(CMake_VERSION_RC 3)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog.manual | 11 -----------
1 files changed, 0 insertions(+), 11 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list