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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=d4f355c1a740ec41717ed51811f41f1761ce22ed
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master-2.0
Repository: wireshark

Commits:

d4f355c by Alexis La Goutte (alexis.lagoutte@xxxxxxxxx):

    merge: fix parameter 'in_files/in_count_files' not found in the function declaration [-Wdocumentation]
    
    Change-Id: Ib3d9b7df5f1396179645456ea7359e711c26b8ef
    Reviewed-on: https://code.wireshark.org/review/12003
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    (cherry picked from commit 9fad599c0f58092f0719839d980de849ba8f8400)
    Reviewed-on: https://code.wireshark.org/review/12052
    

Actions performed:

    from  8ad6404   Qt: Preserve selected file in welcome screen.
    adds  d4f355c   merge: fix parameter 'in_files/in_count_files' not found in the function declaration [-Wdocumentation]


Summary of changes:
 wiretap/merge.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)