[Cmake-commits] CMake branch, next, updated. v3.1.0-1832-g12084d6
Brad King
brad.king at kitware.com
Tue Jan 13 14:45:07 EST 2015
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 12084d6c9159f5efe69d9f600fbeede4b8b150e1 (commit)
via f2243ff0b724e907ba1db2be2130f0cdaabc02e7 (commit)
from 3b39c774d7a62c7e21c40f9b2256c31faa8e3892 (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=12084d6c9159f5efe69d9f600fbeede4b8b150e1
commit 12084d6c9159f5efe69d9f600fbeede4b8b150e1
Merge: 3b39c77 f2243ff
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 13 14:45:06 2015 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 13 14:45:06 2015 -0500
Merge topic 'cdash_upload_file_mode' into next
f2243ff0 Revise topic 'cdash_upload_file_mode'
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f2243ff0b724e907ba1db2be2130f0cdaabc02e7
commit f2243ff0b724e907ba1db2be2130f0cdaabc02e7
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 13 14:44:48 2015 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 13 14:44:48 2015 -0500
Revise topic 'cdash_upload_file_mode'
diff --git a/Utilities/cmjsoncpp/README-CMake.txt b/Utilities/cmjsoncpp/README-CMake.txt
index cfd2d4d..c7959ca 100644
--- a/Utilities/cmjsoncpp/README-CMake.txt
+++ b/Utilities/cmjsoncpp/README-CMake.txt
@@ -11,7 +11,7 @@ branch, but it is merged into our history.
Update jsoncpp from upstream as follows. Create a local branch to
explicitly reference the upstream snapshot branch head:
- git branch jsoncpp-upstream ca64c01e
+ git branch jsoncpp-upstream 53f6ccb0
Use a temporary directory to checkout the branch:
@@ -24,7 +24,7 @@ Use a temporary directory to checkout the branch:
Now place the (reduced) jsoncpp content in this directory. See
instructions shown by
- git log ca64c01e
+ git log 53f6ccb0
for help extracting the content from the upstream svn repo. Then run
the following commands to commit the new version. Substitute the
-----------------------------------------------------------------------
Summary of changes:
Utilities/cmjsoncpp/README-CMake.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list