Wireshark-commits: [Wireshark-commits] master bac680c: Get Windows build working again.

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Tue, 25 Feb 2014 22:49:19 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=bac680caf563402ed4ea381ea51aed326f0e8a1c
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

bac680c by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Get Windows build working again.
    
    Change 16 / g579e7e1 introduced a breaking change in
    capture_file_dialog.cpp on Windows. This works around the problem
    temporarily until we come up with a proper fix.
    
    Fix a Q_OS_WIN check while we're at it.
    
    Change-Id: I552d60720e4a45c5144e0047ee3c1fcc7e64f4eb
    Reviewed-on: https://code.wireshark.org/review/396
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  a7de012   Add a few more dissectors to release notes
    adds  bac680c   Get Windows build working again.


Summary of changes:
 ui/qt/capture_file_dialog.cpp |    3 ++-
 ui/qt/capture_file_dialog.h   |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)