aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/merge.c
diff options
context:
space:
mode:
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:
+ */