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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=d3728738ddbb24daf248aa4d2f9ad94702a1ed0f
Submitter: Graham Bloice (graham.bloice@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

d372873 by Graham Bloice (graham.bloice@xxxxxxxxxxxxx):

    Updates for docbook builds on Windows
    
    In config.nmake search for multiple versions of fop in a couple of places, preferring fop 1.1
    In Makefile.nmake remove any PYTHONPATH env var (as that's probably for Windows)
    and not the Cygwin python used in asciidoc
    In Readme.txt update some Cygwin package info
    
    Change-Id: I117ec6bbdabc34829b421fd514508383b925090f
    Reviewed-on: https://code.wireshark.org/review/3816
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Reviewed-by: Graham Bloice <graham.bloice@xxxxxxxxxxxxx>
    

Actions performed:

    from  1aead57   reformat dissect_usb_setup_response() make sure it can handle usb_conv_info==NULL
    adds  d372873   Updates for docbook builds on Windows


Summary of changes:
 config.nmake           |   10 ++++++++++
 docbook/Makefile.nmake |    7 +++++++
 docbook/README.txt     |   20 +++++++++++---------
 3 files changed, 28 insertions(+), 9 deletions(-)