Wireshark-commits: [Wireshark-commits] master-1.12 50c5cac: 1.12.4 → 1.12.5

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Wed, 4 Mar 2015 19:31:27 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=50c5cac12aedcd0c348ca57baa1cca8f207e8d36
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

50c5cac by Gerald Combs (gerald@xxxxxxxxxxxxx):

    1.12.4 → 1.12.5
    
    Change-Id: I3d7907247f9bc14e3104aa9cb98f588967953d1b
    Reviewed-on: https://code.wireshark.org/review/7529
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  b4861da   Build 1.12.4.
    adds  50c5cac   1.12.4 → 1.12.5


Summary of changes:
 ChangeLog                      | 2003 ----------------------------------------
 config.nmake                   |    2 +-
 configure.ac                   |    2 +-
 debian/changelog               |    2 +-
 docbook/asciidoc.conf          |    2 +-
 docbook/release-notes.asciidoc |  173 +---
 epan/Makefile.am               |    2 +-
 filetap/Makefile.am            |    2 +-
 make-version.pl                |    2 +-
 version.conf                   |   12 +-
 wiretap/Makefile.am            |    2 +-
 11 files changed, 21 insertions(+), 2183 deletions(-)