[Cmake-commits] CMake branch, next, updated. v2.8.12-4078-ge6e7209

[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  e6e72090842f99b9e58c419567a640600a53b1c3 (commit)
       via  60e2e20be841626b95c92ec46a82ca08287028d5 (commit)
      from  e917cf1bef98d2bfca950a79f7d1105797118f23 (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=e6e72090842f99b9e58c419567a640600a53b1c3
commit e6e72090842f99b9e58c419567a640600a53b1c3
Merge: e917cf1 60e2e20
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Wed Oct 16 16:18:32 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 16 16:18:32 2013 -0400

    Merge topic 'wix-documentation-escapes' into next
    
    60e2e20 CPackWiX: use inline literals instead of escapes in docs


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=60e2e20be841626b95c92ec46a82ca08287028d5
commit 60e2e20be841626b95c92ec46a82ca08287028d5
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Wed Oct 16 19:55:11 2013 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Wed Oct 16 19:55:11 2013 +0200

    CPackWiX: use inline literals instead of escapes in docs

diff --git a/Modules/CPackWIX.cmake b/Modules/CPackWIX.cmake
index ea118f8..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:
 Modules/CPackWIX.cmake |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake