[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-226-g6143d7b
Brad King
brad.king at kitware.com
Thu Oct 8 14:43:15 EDT 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 6143d7b19761653a13e96b03705392eeb2a78dd5 (commit)
via fb9ec2430be48aeb56984625a4e106b82a160653 (commit)
from 7336ce66bf26816ca7469120bb958cdb5e01f50f (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=6143d7b19761653a13e96b03705392eeb2a78dd5
commit 6143d7b19761653a13e96b03705392eeb2a78dd5
Merge: 7336ce6 fb9ec24
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 8 14:43:14 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 8 14:43:14 2015 -0400
Merge topic 'cpack-wix-typos' into next
fb9ec243 CPackWIX: fix typos in documentation
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb9ec2430be48aeb56984625a4e106b82a160653
commit fb9ec2430be48aeb56984625a4e106b82a160653
Author: Kevin Wojniak <kainjow at kainjow.com>
AuthorDate: Thu Oct 8 11:39:07 2015 -0700
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Oct 8 14:42:52 2015 -0400
CPackWIX: fix typos in documentation
diff --git a/Modules/CPackWIX.cmake b/Modules/CPackWIX.cmake
index 5fe51a6..bef8e16 100644
--- a/Modules/CPackWIX.cmake
+++ b/Modules/CPackWIX.cmake
@@ -16,7 +16,7 @@
#
# Will be automatically generated unless explicitly provided.
#
-# It should be explicitly set to a constant generated gloabally unique
+# It should be explicitly set to a constant generated globally unique
# identifier (GUID) to allow your installers to replace existing
# installations that use the same GUID.
#
@@ -226,7 +226,7 @@
# This variable can be used to provide a value for
# the Windows Installer property ``<PROPERTY>``
#
-# The follwing list contains some example properties that can be used to
+# The following list contains some example properties that can be used to
# customize information under
# "Programs and Features" (also known as "Add or Remove Programs")
#
-----------------------------------------------------------------------
Summary of changes:
Modules/CPackWIX.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list