[Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-619-g82c86e4

[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  82c86e4a875fb74ed455a2cf34f2b82a18a1417f (commit)
       via  6cc01c140245749bb6a6d5096b4a38f3f16fb776 (commit)
      from  983811fb737927e3d50402b34d15fe03bf2cca42 (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=82c86e4a875fb74ed455a2cf34f2b82a18a1417f
commit 82c86e4a875fb74ed455a2cf34f2b82a18a1417f
Merge: 983811f 6cc01c1
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Feb 23 10:50:45 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 23 10:50:45 2015 -0500

    Merge topic 'wix-shortcut-properties' into next
    
    6cc01c14 CPackWIX: Add release notes for the wix-shortcut-properties topic.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6cc01c140245749bb6a6d5096b4a38f3f16fb776
commit 6cc01c140245749bb6a6d5096b4a38f3f16fb776
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Feb 23 16:49:42 2015 +0100
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Mon Feb 23 16:49:42 2015 +0100

    CPackWIX: Add release notes for the wix-shortcut-properties topic.

diff --git a/Help/release/dev/wix-shortcut-properties.rst b/Help/release/dev/wix-shortcut-properties.rst
new file mode 100644
index 0000000..bdd6485
--- /dev/null
+++ b/Help/release/dev/wix-shortcut-properties.rst
@@ -0,0 +1,9 @@
+wix-shortcut-properties
+-----------------------
+
+* The CPack WIX generator learned the new
+  :prop_inst:`CPACK_START_MENU_SHORTCUTS`,
+  :prop_inst:`CPACK_DESKTOP_SHORTCUTS` and
+  :prop_inst:`CPACK_STARTUP_SHORTCUTS` installed file properties which can
+  be used to install shorcuts in the Start Menu, on the Desktop and
+  in the Startup Folder respectively.

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

Summary of changes:
 Help/release/dev/wix-shortcut-properties.rst |    9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 Help/release/dev/wix-shortcut-properties.rst


hooks/post-receive
-- 
CMake