[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=c7239f0201292253817c7c4c9a394a47113ca55c
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-2.6
Repository: wireshark

Commits:

c7239f0 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Build 2.6.0.
    
    Change-Id: I238e2397f8e66bc439bf3eb63ff86a8e0f84ed50
    Reviewed-on: https://code.wireshark.org/review/27120
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  0f06bf5   Strengthen the heuristcs that check for "alternate" pcap formats.
    adds  c7239f0   Build 2.6.0.


Summary of changes:
 ChangeLog                      | 1721 +++++++++++++++++++++++++---------------
 NEWS                           |  205 ++---
 docbook/release-notes.asciidoc |   14 +-
 version.conf                   |   12 +-
 4 files changed, 1208 insertions(+), 744 deletions(-)