[Cmake-commits] CMake branch, next, updated. v2.8.12-4080-gaad93f7

[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  aad93f73cf8fda8214c4f105399eeb170a6ad764 (commit)
       via  42b4f6cbcf561f3e0f85a727c37e352924f78faa (commit)
      from  e6e72090842f99b9e58c419567a640600a53b1c3 (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=aad93f73cf8fda8214c4f105399eeb170a6ad764
commit aad93f73cf8fda8214c4f105399eeb170a6ad764
Merge: e6e7209 42b4f6c
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Wed Oct 16 16:20:59 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 16 16:20:59 2013 -0400

    Merge topic 'wix-documentation-escapes' into next
    
    42b4f6c CPackWiX: prevent attribute references in docs from being interpreted


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=42b4f6cbcf561f3e0f85a727c37e352924f78faa
commit 42b4f6cbcf561f3e0f85a727c37e352924f78faa
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Wed Oct 16 17:12:31 2013 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Wed Oct 16 22:20:10 2013 +0200

    CPackWiX: prevent attribute references in docs from being interpreted

diff --git a/Modules/CPackWIX.cmake b/Modules/CPackWIX.cmake
index 7c7d924..f4fcf6a 100644
--- a/Modules/CPackWIX.cmake
+++ b/Modules/CPackWIX.cmake
@@ -12,7 +12,7 @@
 #
 # .. variable:: CPACK_WIX_UPGRADE_GUID
 #
-#  Upgrade GUID (Product/@UpgradeCode)
+#  Upgrade GUID (``Product/@UpgradeCode``)
 #
 #  Will be automatically generated unless explicitly provided.
 #
@@ -33,7 +33,7 @@
 #
 # .. variable:: CPACK_WIX_PRODUCT_GUID
 #
-#  Product GUID (Product/@Id)
+#  Product GUID (``Product/@Id``)
 #
 #  Will be automatically generated unless explicitly provided.
 #

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

Summary of changes:


hooks/post-receive
-- 
CMake