Wireshark-commits: [Wireshark-commits] master 9797f34: Move the merge_action_e enum to the Win32 fi

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Fri, 09 Feb 2018 20:43:45 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=9797f340747e3f47191fe6b8df2dee657aa2179d
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

9797f34 by Guy Harris (guy@xxxxxxxxxxxx):

    Move the merge_action_e enum to the Win32 file dialog source file.
    
    It's only used with the Windows dialog, so no need to make it public.
    
    Change-Id: I4976748d642399b57abc89bccc26f680e3938509
    Reviewed-on: https://code.wireshark.org/review/25719
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  794596d   Fix indentation.
    adds  9797f34   Move the merge_action_e enum to the Win32 file dialog source file.


Summary of changes:
 ui/file_dialog.h          | 6 ------
 ui/win32/file_dlg_win32.c | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)