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@yahoo.com>
This commit is contained in:
Hadriel Kaplan 2015-08-14 10:44:11 -04:00
parent 46d6e8cc62
commit 4c6da64ada
2 changed files with 155 additions and 155 deletions

View File

@ -283,11 +283,11 @@ merge_append_read_packet(int in_file_count, merge_in_file_t in_files[],
* Editor modelines - http://www.wireshark.org/tools/modelines.html
*
* Local Variables:
* c-basic-offset: 2
* tab-width: 8
* c-basic-offset: 4
* tab-width: 4
* indent-tabs-mode: nil
* End:
*
* vi: set shiftwidth=2 tabstop=8 expandtab:
* :indentSize=2:tabSize=8:noTabs=true:
* vi: set shiftwidth=4 tabstop=4 expandtab:
* :indentSize=4:tabSize=4:noTabs=true:
*/