[Cmake-commits] CMake branch, master, updated. v3.0.0-1560-g2d4312a

[Brad King]

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, master has been updated
       via  2d4312a160b67f962d28cfe24871c256cd3b53da (commit)
       via  f931a18c334bd471c22f7af4e580b2433ba14a69 (commit)
      from  b801754d1ec8740146ea76047d241b9ff331e069 (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=2d4312a160b67f962d28cfe24871c256cd3b53da
commit 2d4312a160b67f962d28cfe24871c256cd3b53da
Merge: b801754 f931a18
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 30 09:31:45 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 30 09:31:45 2014 -0400

    Merge topic 'cpack-add-lzma'
    
    f931a18c CPack: add generators for .7z and .tar.xz (#13072, #14519)


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

Summary of changes:
 Help/release/dev/cpack-add-lzma.rst                  |    5 +++++
 Source/CMakeLists.txt                                |    2 ++
 ...mCPackZIPGenerator.cxx => cmCPack7zGenerator.cxx} |    9 ++++-----
 .../{cmCPackZIPGenerator.h => cmCPack7zGenerator.h}  |   18 +++++++++---------
 Source/CPack/cmCPackGeneratorFactory.cxx             |   12 ++++++++++++
 ...CPackTGZGenerator.cxx => cmCPackTXZGenerator.cxx} |    9 ++++-----
 .../{cmCPackTGZGenerator.h => cmCPackTXZGenerator.h} |   18 +++++++++---------
 Source/cmArchiveWrite.cxx                            |   10 +++++++++-
 Source/cmArchiveWrite.h                              |    3 ++-
 9 files changed, 56 insertions(+), 30 deletions(-)
 create mode 100644 Help/release/dev/cpack-add-lzma.rst
 copy Source/CPack/{cmCPackZIPGenerator.cxx => cmCPack7zGenerator.cxx} (81%)
 copy Source/CPack/{cmCPackZIPGenerator.h => cmCPack7zGenerator.h} (63%)
 copy Source/CPack/{cmCPackTGZGenerator.cxx => cmCPackTXZGenerator.cxx} (81%)
 copy Source/CPack/{cmCPackTGZGenerator.h => cmCPackTXZGenerator.h} (63%)


hooks/post-receive
-- 
CMake