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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=c156a644e0e00f0aa84a414e84603bf6fc079959
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

c156a64 by Guy Harris (guy@xxxxxxxxxxxx):

    Make routines used only within wiretap/merge.c static.
    
    We just export some UI helpers and the Big Merge Engine.
    
    Change-Id: I60bc8ab167e7100189a9ce60d84c0e4db27b6bda
    Reviewed-on: https://code.wireshark.org/review/11689
    Petri-Dish: Guy Harris <guy@xxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 5f4c9b2bb2903e8ce720e072525b1f43e846a513)
    Reviewed-on: https://code.wireshark.org/review/11723
    

Actions performed:

    from  4afc1be   Qt: Freeze+thaw the main window during nested operations.
    adds  c156a64   Make routines used only within wiretap/merge.c static.


Summary of changes:
 debian/libwiretap0.symbols |    6 ---
 wiretap/merge.c            |   89 +++++++++++++++++++++++---------------------
 wiretap/merge.h            |   71 -----------------------------------
 3 files changed, 46 insertions(+), 120 deletions(-)