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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=2e066515efe1a157c68be72cc6dbf080bc422404
Submitter: "Pascal Quantin <pascal@xxxxxxxxxxxxx>"
Changed: branch: master-2.6
Repository: wireshark

Commits:

2e06651 by Pascal Quantin (pascal@xxxxxxxxxxxxx):

    dumpcap: fix capture library version display on Windows
    
    Ensure to call load_wpcap() berfore building the version info string.
    
    Bug: 16108
    Change-Id: Ida7ecf6ad5186f816e1bf33902a0ae70f7f36b40
    Reviewed-on: https://code.wireshark.org/review/34719
    Reviewed-by: Pascal Quantin <pascal@xxxxxxxxxxxxx>
    Petri-Dish: Pascal Quantin <pascal@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    (cherry picked from commit 2cac9d47af2f9851088f8b1d6ca8b7eea1d49774)
    Conflicts:
    	dumpcap.c
    Reviewed-on: https://code.wireshark.org/review/34720
    (cherry picked from commit 2fa9fad6e2c330558326d91bb06988d9a4115ae9)
    Conflicts:
    	dumpcap.c
    Reviewed-on: https://code.wireshark.org/review/34721
    

Actions performed:

    from  9ff620b   [Automatic update for 2019-10-06]
     add  2e06651   dumpcap: fix capture library version display on Windows


Summary of changes:
 dumpcap.c | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)