Wireshark-commits: [Wireshark-commits] master-1.12 7da8c2a: Initialize master-1.12.

Date Prev · Date Next · Thread Prev · Thread Next
Date Index · Thread Index · Other Months · All Mailing Lists
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Fri, 23 May 2014 20:48:29 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=7da8c2ace9b62be3366b6c25d875f2e80b1b1656
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-1.12
Repository: wireshark

Commits:

7da8c2a by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Initialize master-1.12.
    
    Change-Id: Idc679d0c7f13934fceb4d196d76abdefc51f4450
    (cherry picked from commit 543ff5713546c82f9bc44af3198136501593e09f)
    Reviewed-on: https://code.wireshark.org/review/1760
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  8a7e1f4   Don't assume all packets have time stamps.
    adds  7da8c2a   Initialize master-1.12.


Summary of changes:
 CMakeOptions.txt      |    2 +-
 config.nmake          |   12 ++++++------
 configure.ac          |    8 ++++----
 debian/changelog      |    2 +-
 docbook/asciidoc.conf |    2 +-
 epan/Makefile.am      |    2 +-
 filetap/Makefile.am   |    2 +-
 make-version.pl       |    4 ++--
 version.conf          |    9 +++++++++
 wiretap/Makefile.am   |    2 +-
 wsutil/Makefile.am    |    2 +-
 11 files changed, 28 insertions(+), 19 deletions(-)
 create mode 100644 version.conf