[Cmake-commits] CMake branch, next, updated. v2.8.12-4069-g435453c

[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  435453c6a06b66758b8ef599c84ff9a6d5ad1f8a (commit)
       via  9313eafa5583306b514476bf94a990f289f7d633 (commit)
      from  4cf215666369e845d29d15ce31bc81ddee2b9d26 (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=435453c6a06b66758b8ef599c84ff9a6d5ad1f8a
commit 435453c6a06b66758b8ef599c84ff9a6d5ad1f8a
Merge: 4cf2156 9313eaf
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Wed Oct 16 11:15:32 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 16 11:15:32 2013 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9313eafa5583306b514476bf94a990f289f7d633
commit 9313eafa5583306b514476bf94a990f289f7d633
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 17:12:31 2013 +0200

    CPackWiX: prevent attribute references in docs from being interpreted

diff --git a/Modules/CPackWIX.cmake b/Modules/CPackWIX.cmake
index 7c7d924..ea118f8 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