[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5084-g7fbc462

[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  7fbc4621aac27762fed30449189bdb2fe680d12d (commit)
       via  8a5b5ba36667ce4f617498c40e6fc1c972da4067 (commit)
      from  c4db8e25fb84ed7bbf74b44e8178a3bd6db9c0a6 (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=7fbc4621aac27762fed30449189bdb2fe680d12d
commit 7fbc4621aac27762fed30449189bdb2fe680d12d
Merge: c4db8e2 8a5b5ba
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Nov 12 08:56:52 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 12 08:56:52 2013 -0500

    Merge topic 'wix-custom-arguments' into next
    
    8a5b5ba CPackWiX: documentation formatting changes and cleanup


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8a5b5ba36667ce4f617498c40e6fc1c972da4067
commit 8a5b5ba36667ce4f617498c40e6fc1c972da4067
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Tue Nov 12 14:56:06 2013 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Tue Nov 12 14:56:06 2013 +0100

    CPackWiX: documentation formatting changes and cleanup

diff --git a/Modules/CPackWIX.cmake b/Modules/CPackWIX.cmake
index aceba4a..3f0978d 100644
--- a/Modules/CPackWIX.cmake
+++ b/Modules/CPackWIX.cmake
@@ -132,26 +132,22 @@
 # .. variable:: CPACK_WIX_<TOOL>_EXTENSIONS
 #
 #  This is the tool specific version of CPACK_WIX_EXTENSIONS.
-#  <TOOL> can be either LIGHT or CANDLE.
+#  ``<TOOL>`` can be either LIGHT or CANDLE.
 #
 # .. variable:: CPACK_WIX_<TOOL>_EXTRA_FLAGS
 #
 #  This list variable allows you to pass additional
-#  flags to the WiX tool <TOOL>.
+#  flags to the WiX tool ``<TOOL>``.
 #
 #  Use it at your own risk.
 #  Future versions of CPack may generate flags which may be in conflict
 #  with your own flags.
 #
-#  <TOOL> can be either LIGHT or CANDLE.
-#
-
-#  Future versions of CMake may
-#
+#  ``<TOOL>`` can be either LIGHT or CANDLE.
 #
 
 #=============================================================================
-# Copyright 2012 Kitware, Inc.
+# Copyright 2013 Kitware, Inc.
 #
 # Distributed under the OSI-approved BSD License (the "License");
 # see accompanying file Copyright.txt for details.

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

Summary of changes:
 Modules/CPackWIX.cmake |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake