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 9178b7cdf066b709fd70d83533ffc77abc69465b (commit)
via f41f12f460850da28b60e91ccbb9ca7f98ec6e7c (commit)
from 39051c9bd0ffbc6f47ce7429e7d09ee0a045a025 (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=9178b7cdf066b709fd70d83533ffc77abc69465b
commit 9178b7cdf066b709fd70d83533ffc77abc69465b
Merge: 39051c9 f41f12f
Author: Nils Gladitz <nilsglad...@gmail.com>
AuthorDate: Fri Feb 13 06:09:14 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Feb 13 06:09:14 2015 -0500
Merge topic 'wix-product-fragment' into next
f41f12f4 CPackWIX: Fix copyright ranges
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f41f12f460850da28b60e91ccbb9ca7f98ec6e7c
commit f41f12f460850da28b60e91ccbb9ca7f98ec6e7c
Author: Nils Gladitz <nilsglad...@gmail.com>
AuthorDate: Fri Feb 13 12:08:41 2015 +0100
Commit: Nils Gladitz <nilsglad...@gmail.com>
CommitDate: Fri Feb 13 12:08:41 2015 +0100
CPackWIX: Fix copyright ranges
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
index 59c0e73..11d5437 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx
@@ -1,6 +1,6 @@
/*============================================================================
CMake - Cross Platform Makefile Generator
- Copyright 2014-2015 Kitware, Inc., Insight Software Consortium
+ Copyright 2012-2015 Kitware, Inc., Insight Software Consortium
Distributed under the OSI-approved BSD License (the "License");
see accompanying file Copyright.txt for details.
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.h
b/Source/CPack/WiX/cmCPackWIXGenerator.h
index ecd0738..7035297 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.h
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.h
@@ -1,6 +1,6 @@
/*============================================================================
CMake - Cross Platform Makefile Generator
- Copyright 2014-2015 Kitware, Inc.
+ Copyright 2012-2015 Kitware, Inc.
Distributed under the OSI-approved BSD License (the "License");
see accompanying file Copyright.txt for details.
-----------------------------------------------------------------------
Summary of changes:
Source/CPack/WiX/cmCPackWIXGenerator.cxx | 2 +-
Source/CPack/WiX/cmCPackWIXGenerator.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
