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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=897cc8aa0e714b93a31f8d99269440ea73f5c37a
Submitter: "Gerald Combs <gerald@xxxxxxxxxxxxx>"
Changed: branch: master-2.6
Repository: wireshark

Commits:

897cc8a by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Prep for 2.6.18.
    
    Change-Id: Ia698f7ba71c7ceec8383cd18ba7102d3061c2d7e
    Reviewed-on: https://code.wireshark.org/review/37626
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  93caa0b   DOC: fix layout mergecap manual page
     add  897cc8a   Prep for 2.6.18.


Summary of changes:
 docbook/release-notes.asciidoc | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)