Wireshark · Wireshark-commits: [Wireshark-commits] master-1.10 c7c5977: Backport g97c9a9b from git/master to git/master-1.10

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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=c7c59771e6a217ac68546374e676fa2d33708d6d
Submitter: Bill Meier (wmeier@xxxxxxxxxxx)
Changed: branch: master-1.10
Repository: wireshark

Commits:

c7c5977 by Bill Meier (wmeier@xxxxxxxxxxx):

    Backport g97c9a9b from git/master to git/master-1.10
    
    Fix for part 2 of Bug #9834
    
    https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9834
    
    ========
        commit 97c9a9b9ba3c29f394c306d6ba9bd1916d06c430
        Author: Gerald Combs <gerald@xxxxxxxxxxxxx>
        Date:   Fri Aug 2 16:34:31 2013 +0000
    
            Make sure we're compatible with Python 2 + 3. Tested with Pythons 2.5,
            2.7, and 3.3. The contents of packet-ncp2222.c are different after the
            changes (e.g. some array contents are in a different order) but the
            output of running 'tshark -nVxr' on the NCP files in the menagerie are
            identical.
    
            svn path=/trunk/; revision=51123
    
    Change-Id: Ib500bade79d65b97a57eeb4dd497228a6eb85c19
    Reviewed-on: https://code.wireshark.org/review/508
    Reviewed-by: Bill Meier <wmeier@xxxxxxxxxxx>
    Tested-by: Bill Meier <wmeier@xxxxxxxxxxx>
    

Actions performed:

    from  d58a92f   Update the release notes.
    adds  c7c5977   Backport g97c9a9b from git/master to git/master-1.10


Summary of changes:
 tools/ncp2222.py |26791 +++++++++++++++++++++++++++---------------------------
 1 file changed, 13398 insertions(+), 13393 deletions(-)