Wireshark-commits: [Wireshark-commits] master dacc7ee: Pull in some changes from master-1.10/make-v

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: Mon, 14 Apr 2014 17:15:03 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=dacc7eea39ec560bf5c8edf0e850d1798c678b67
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

dacc7ee by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Pull in some changes from master-1.10/make-version.pl.
    
    Matches versioning behavior in stable branches.
    
    Change-Id: Ic4d451e7e9941b65d24a76bfaf57de2b4fb58239
    Reviewed-on: https://code.wireshark.org/review/1124
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  e9e4277   Add support of RFC 6514 PMSI bgp attribute and tunnel ID decoding
    adds  dacc7ee   Pull in some changes from master-1.10/make-version.pl.


Summary of changes:
 make-version.pl |   30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)