summaryrefslogtreecommitdiff
path: root/wiretap/merge.c
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2015-01-01 19:45:22 -0500
committerBill Meier <wmeier@newsguy.com>2015-01-02 00:49:09 +0000
commit454fd6e9eb3009cd346443ba06498904d6cea228 (patch)
treed7b5e3e699e0992a0d767b7017fbac44a0531069 /wiretap/merge.c
parent887cce4a5f4a03a74899d8f7388550aeaed7edc5 (diff)
downloadwireshark-454fd6e9eb3009cd346443ba06498904d6cea228.tar.gz
Add "Editor modelines"; Adjust whitespace as needed.
Change-Id: Ic5a5acb0f36d3aa144edbfb1ae71097b18426db4 Reviewed-on: https://code.wireshark.org/review/6216 Reviewed-by: Bill Meier <wmeier@newsguy.com>
Diffstat (limited to 'wiretap/merge.c')
-rw-r--r--wiretap/merge.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/wiretap/merge.c b/wiretap/merge.c
index bf10f4ccdc..3b320fa53b 100644
--- a/wiretap/merge.c
+++ b/wiretap/merge.c
@@ -284,3 +284,16 @@ merge_append_read_packet(int in_file_count, merge_in_file_t in_files[],
*err = 0;
return &in_files[i];
}
+
+/*
+ * Editor modelines - http://www.wireshark.org/tools/modelines.html
+ *
+ * Local Variables:
+ * c-basic-offset: 2
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=2 tabstop=8 expandtab:
+ * :indentSize=2:tabSize=8:noTabs=true:
+ */