Wireshark-commits: [Wireshark-commits] master-2.6 cc42ff3: 2.6.1 → 2.6.2.

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Tue, 22 May 2018 20:00:50 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=cc42ff324f6b9f503073646bff768e5f53630006
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-2.6
Repository: wireshark

Commits:

cc42ff3 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    2.6.1 → 2.6.2.
    
    Change-Id: I0e58217c49e9bcd12c6a8e0b39381936bfabd6e5
    Reviewed-on: https://code.wireshark.org/review/27722
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  860a78b   Build 2.6.1.
    adds  cc42ff3   2.6.1 → 2.6.2.


Summary of changes:
 CMakeLists.txt                 |    2 +-
 ChangeLog                      | 1668 ----------------------------------------
 configure.ac                   |    2 +-
 debian/changelog               |    2 +-
 docbook/attributes.asciidoc    |    2 +-
 docbook/release-notes.asciidoc |  160 +---
 epan/CMakeLists.txt            |    2 +-
 epan/Makefile.am               |    2 +-
 make-version.pl                |    2 +-
 version.conf                   |   12 +-
 wiretap/CMakeLists.txt         |    2 +-
 wiretap/Makefile.am            |    2 +-
 12 files changed, 23 insertions(+), 1835 deletions(-)