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

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

Commits:

5abc15f by Bill Meier (wmeier@xxxxxxxxxxx):

    Backport 2336eb9 (python3 compatibility) from git/master to git/master-1.10
    
    Another Fix for part 2 of Bug #9834
    
    https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9834
    
    ============
        commit 2336eb9919e20de306b29ab34d1ca12550930f4a
        Author: Gerald Combs <gerald@xxxxxxxxxxxxx>
        Date:   Fri Aug 2 00:22:51 2013 +0000
    
            Make sure we're compatible with Python 2 + 3. Tested with Pythons 2.5,
            2.7, and 3.3.
    
            svn path=/trunk/; revision=51106
            /tools/make-tap-reg.py
    
    Change-Id: I2a7aca979c596b4d06e91490aaf42126bb9da211
    Reviewed-on: https://code.wireshark.org/review/509
    Reviewed-by: Bill Meier <wmeier@xxxxxxxxxxx>
    Tested-by: Bill Meier <wmeier@xxxxxxxxxxx>
    

Actions performed:

    from  c7c5977   Backport g97c9a9b from git/master to git/master-1.10
    adds  5abc15f   Backport 2336eb9 (python3 compatibility) from git/master to git/master-1.10


Summary of changes:
 tools/make-tap-reg.py |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)