Huge thanks to our Platinum Members Endace and LiveAction,
and our Silver Member Veeam, for supporting the Wireshark Foundation and project.

Wireshark-commits: [Wireshark-commits] master 72e15f2: Merge capture->interfaces and capture->optio

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Wed, 9 Jul 2014 12:34:48 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=72e15f22ea891e14a2fb11be9b1501bb4bd38f05
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

72e15f2 by Evan Huus (eapache@xxxxxxxxx):

    Merge capture->interfaces and capture->options
    
    Change-Id: I0a2976da97bd777abbf4701915551d9d481b0a13
    Reviewed-on: https://code.wireshark.org/review/2785
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  4b5967f   Moved nghttp2 to epan Cleaned up nghttp2 build
    adds  72e15f2   Merge capture->interfaces and capture->options


Summary of changes:
 ui/qt/main_window.h         |    4 ----
 ui/qt/main_window.ui        |    1 -
 ui/qt/main_window_slots.cpp |   20 +-------------------
 3 files changed, 1 insertion(+), 24 deletions(-)