[Cmake-commits] CMake branch, next, updated. v3.5.0-rc2-163-g22be9ed

[Nils Gladitz]

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  22be9ed8cfb5190671b606859354d7ab82d2c958 (commit)
       via  0197a73c2da37347844cf62842a17887eeb045fa (commit)
      from  7c655095751e2bf37bc04db9c5f77d95acd4c985 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=22be9ed8cfb5190671b606859354d7ab82d2c958
commit 22be9ed8cfb5190671b606859354d7ab82d2c958
Merge: 7c65509 0197a73
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Feb 16 18:05:30 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 16 18:05:30 2016 -0500

    Merge topic 'unix-timestamps' into next
    
    0197a73c !fixup CMake: Fix brackets in cmTimestamp MSVC branch


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0197a73c2da37347844cf62842a17887eeb045fa
commit 0197a73c2da37347844cf62842a17887eeb045fa
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Wed Feb 17 00:05:17 2016 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Wed Feb 17 00:05:17 2016 +0100

    !fixup CMake: Fix brackets in cmTimestamp MSVC branch

diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx
index 302ea6d..6e059db 100644
--- a/Source/cmTimestamp.cxx
+++ b/Source/cmTimestamp.cxx
@@ -128,8 +128,8 @@ time_t cmTimestamp::CreateUtcTimeTFromTm(struct tm &tm) const
   tzset();
 
   return result;
-}
 #endif
+}
 
 //----------------------------------------------------------------------------
 std::string cmTimestamp::AddTimestampComponent(

-----------------------------------------------------------------------

Summary of changes:
 Source/cmTimestamp.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake