Wireshark-commits: [Wireshark-commits] master 4c6da64: Ident the merge.c/h files by 4 spaces

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Fri, 14 Aug 2015 14:50:19 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=4c6da64adaf5312f2615e6196d3d2f5967803caf
Submitter: Hadriel Kaplan (hadrielk@xxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

4c6da64 by Hadriel Kaplan (hadrielk@xxxxxxxxx):

    Ident the merge.c/h files by 4 spaces
    
    Using 2 spaces for indent is way past its prime.
    
    Change-Id: I80caf89f15e576f9aeb25754576a9f18215ccb3c
    Reviewed-on: https://code.wireshark.org/review/10032
    Reviewed-by: Hadriel Kaplan <hadrielk@xxxxxxxxx>
    

Actions performed:

    from  46d6e8c   Added some missing breaks
    adds  4c6da64   Ident the merge.c/h files by 4 spaces


Summary of changes:
 wiretap/merge.c |  282 +++++++++++++++++++++++++++----------------------------
 wiretap/merge.h |   24 ++---
 2 files changed, 153 insertions(+), 153 deletions(-)